Merge branch 'master' of 49.232.152.146:xhxy/smart_school

ruoyi-ui/src/assets/styles/index.scss

@@ -203,5 +203,5 @@ aside {
   align-items: center;
   align-items: center;
 }
 }
 .selectWidth {
 .selectWidth {
-  width: 100%;
+  width: 100%!important;
 }
 }

ruoyi-ui/src/views/smartSchool/schoolProperty/collectionLedger/index.vue

 <template>
 <template>
-    <div>
-        <h2>领用台帐</h2>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="80px">
+      <el-form-item label="设备名称" prop="studentName">
+        <el-input v-model="queryParams.xc" placeholder="请输入设备名称" clearable/>
+      </el-form-item>
+      <el-form-item label="领用人" prop="studentName">
+        <el-input v-model="queryParams.xc" placeholder="请输入领用人" clearable/>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="getList">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleOption(0)">新增</el-button>
+      </el-col>
+    </el-row>
+    <el-table v-loading="loading" :data="collectionData" stripe>
+      <el-table-column type="selection" width="55"></el-table-column>
+      <el-table-column label="序号" type="index" width="55" align="center"/>
+      <el-table-column label="自编码" align="center" prop="studentName"/>
+      <el-table-column label="设备名称" align="center" prop="studentNumber"/>
+      <el-table-column label="型号" align="center" prop="studentNumber"/>
+      <el-table-column label="领用日期" align="center" prop="studentNumber"/>
+      <el-table-column label="领用人" align="center" prop="studentNumber"/>
+      <el-table-column label="退还日期" align="center" prop="studentNumber"/>
+      <el-table-column label="退还时设备情况" align="center" prop="studentNumber"/>
+      <el-table-column label="接收人" align="center" prop="studentNumber"/>
+      <el-table-column label="备注" align="center" prop="studentNumber"/>
+      <el-table-column label="操作" align="center" prop="orgname" width="150">
+        <template slot-scope="{ row }">
+          <el-button type="text" size="small" @click="handleOption(1,row)">编辑</el-button>
+          <el-button type="text" size="small" @click="handleOption(2,row)">查看</el-button>
+          <el-button type="text" size="small" @click="handleDelete(row.id)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination ref="pageBlock" v-show="total > 0" :total="total"
+                :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList"/>
+    <!-- 新增、编辑、查看页面 -->
+    <el-dialog title="详细信息" :visible.sync="dialogVisible" width="50%">
+      <el-form :model="collectionForm" :rules="collectionRules" ref="achievementForm"
+               label-width="110px" label-position="right">
+        <el-row :gutter="30">
+          <el-col :span="12">
+            <el-form-item label="自编码" prop="idCard">
+              <el-input v-model="collectionForm" placeholder="请输入自编码"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="设备名称" prop="idCard">
+              <el-input v-model="collectionForm" placeholder="请输入设备名称"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="30">
+          <el-col :span="12">
+            <el-form-item label="型号" prop="idCard">
+              <el-input v-model="collectionForm" placeholder="请输入型号"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="领用人" prop="idCard">
+              <el-input v-model="collectionForm" placeholder="请输入领用人"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="30">
+          <el-col :span="12">
+            <el-form-item label="领用日期" prop="idCard">
+              <el-date-picker v-model="collectionForm" type="date" clearable class="selectWidth"
+                              placeholder="请选择领用日期" format="yyyy-MM-dd">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="退还日期" prop="idCard">
+              <el-date-picker v-model="collectionForm" type="date" clearable class="selectWidth"
+                              placeholder="请选择退还日期" format="yyyy-MM-dd">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="30">
+          <el-col :span="12">
+            <el-form-item label="接收人" prop="idCard">
+              <el-input v-model="collectionForm" placeholder="请输入接收人"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="退还时设备情况" prop="idCard">
+              <el-input v-model="collectionForm" placeholder="请输入退还时设备情况"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="30">
+          <el-col :span="12">
+            <el-form-item label="预计使用时间" prop="idCard">
+              <el-date-picker v-model="collectionForm" type="datetime" clearable class="selectWidth"
+                              placeholder="请选择领用日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="实际使用时间" prop="idCard">
+              <el-date-picker v-model="collectionForm" type="datetime" clearable class="selectWidth"
+                              placeholder="请选择退还日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="30">
+          <el-col :span="24">
+            <el-form-item label="备注" prop="chemistry">
+              <el-input type="textarea" v-model="lendReturnForm" placeholder="请输入备注"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
   </div>
 </template>
 </template>
 
 
 <script>
 <script>
 export default {
 export default {
+  // dicts: [''],
+  data() {
+    return {
+      queryParams: {
+        xc: '',
+        pageNum: 1,
+        pageSize: 10,
+      },
+      loading: false,
+      total: 0,
+      collectionData: [],
+      collectionForm: {},
+      collectionRules: [],
+      dialogVisible: false,
+      nowType: 0, // 0新增、1编辑、2查看
+    }
+  },
+  methods:{
+    // 获取列表数据
+    getList(){},
 
 
+    // 重置搜索
+    resetQuery(){},
+
+    // 0新增、1编辑、2查看
+    handleOption(type,item){
+      this.nowType = type
+      if(type != 0){
+
+      }
+      this.dialogVisible = true
+    },
+
+    //删除
+    handleDelete(){},
+
+    //表单提交
+    submitForm(){},
+  }
 }
 }
 </script>
 </script>
 
 

ruoyi-ui/src/views/smartSchool/schoolProperty/lendingReturn/index.vue

 <template>
 <template>
-    <div>
-        <h2>借出归还台帐</h2>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="80px">
+      <el-form-item label="设备名称" prop="studentName">
+        <el-input v-model="queryParams.xc" placeholder="请输入设备名称" clearable/>
+      </el-form-item>
+      <el-form-item label="借用日期" prop="studentName">
+        <el-date-picker v-model="queryParams.xc" type="date" clearable
+                        placeholder="请选择借用日期" format="yyyy-MM-dd">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="getList">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleOption(0)">新增</el-button>
+      </el-col>
+    </el-row>
+    <el-table v-loading="loading" :data="lendReturnData" stripe>
+      <el-table-column type="selection" width="55"></el-table-column>
+      <el-table-column label="序号" type="index" width="55" align="center"/>
+      <el-table-column label="自编码" align="center" prop="studentName"/>
+      <el-table-column label="设备名称" align="center" prop="studentNumber"/>
+      <el-table-column label="型号" align="center" prop="studentNumber"/>
+      <el-table-column label="借用日期" align="center" prop="studentNumber"/>
+      <el-table-column label="借用人" align="center" prop="studentNumber"/>
+      <el-table-column label="用途" align="center" prop="studentNumber"/>
+      <el-table-column label="借用期限（天）" align="center" prop="studentNumber"/>
+      <el-table-column label="归还日期" align="center" prop="studentNumber"/>
+      <el-table-column label="归还时设备情况" align="center" prop="studentNumber"/>
+      <el-table-column label="接收人" align="center" prop="studentNumber"/>
+      <el-table-column label="预计使用时间" align="center" prop="studentNumber"/>
+      <el-table-column label="实际使用时间" align="center" prop="studentNumber"/>
+      <el-table-column label="备注" align="center" prop="studentNumber"/>
+      <el-table-column label="操作" align="center" prop="orgname" width="150">
+        <template slot-scope="{ row }">
+          <el-button type="text" size="small" @click="handleOption(1,row)">编辑</el-button>
+          <el-button type="text" size="small" @click="handleOption(2,row)">查看</el-button>
+          <el-button type="text" size="small" @click="handleDelete(row.id)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination ref="pageBlock" v-show="total > 0" :total="total"
+                :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList"/>
+
+    <!-- 新增、编辑、查看页面 -->
+    <el-dialog title="详细信息" :visible.sync="dialogVisible" width="50%">
+      <el-form :model="lendReturnForm" :rules="lendReturnRules" ref="achievementForm"
+               label-width="110px" label-position="right">
+        <el-row :gutter="30">
+          <el-col :span="12">
+            <el-form-item label="自编码" prop="idCard">
+              <el-input v-model="lendReturnForm" placeholder="请输入自编码"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="借用人" prop="idCard">
+              <el-input v-model="lendReturnForm" placeholder="请输入借用人"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="30">
+          <el-col :span="12">
+            <el-form-item label="设备名称" prop="idCard">
+              <el-input v-model="lendReturnForm" placeholder="请输入设备名称"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="型号" prop="idCard">
+              <el-input v-model="lendReturnForm" placeholder="请输入型号"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="30">
+          <el-col :span="12">
+            <el-form-item label="借用日期" prop="idCard">
+              <el-date-picker v-model="lendReturnForm" type="date" clearable class="selectWidth"
+                              placeholder="请选择借用日期" format="yyyy-MM-dd">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="归还日期" prop="idCard">
+              <el-date-picker v-model="lendReturnForm" type="date" clearable class="selectWidth"
+                              placeholder="请选择归还日期" format="yyyy-MM-dd">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="30">
+          <el-col :span="12">
+            <el-form-item label="借用期限（天）" prop="idCard">
+              <el-input v-model="lendReturnForm" placeholder="请输入借用期限"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="归还时设备情况" prop="idCard">
+              <el-input v-model="lendReturnForm" placeholder="请输入归还时设备情况"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="30">
+          <el-col :span="12">
+            <el-form-item label="用途" prop="idCard">
+              <el-input v-model="lendReturnForm" placeholder="请输入用途"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="接收人" prop="idCard">
+              <el-input v-model="lendReturnForm" placeholder="请输入接收人"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="30">
+          <el-col :span="24">
+            <el-form-item label="备注" prop="chemistry">
+              <el-input type="textarea" v-model="lendReturnForm" placeholder="请输入备注"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+      </span>
+    </el-dialog>
+    <!-- 新增、编辑、查看页面 -->
   </div>
   </div>
 </template>
 </template>
 
 
 <script>
 <script>
 export default {
 export default {
+  // dicts: [''],
+  data() {
+    return {
+      queryParams: {
+        xc: '',
+        pageNum: 1,
+        pageSize: 10,
+      },
+      loading: false,
+      total: 0,
+      lendReturnData:[],
+      lendReturnForm:{},
+      lendReturnRules:[],
+      dialogVisible:false,
+      nowType:0, // 0新增、1编辑、2查看
+    }
+  },
+  methods:{
+    // 获取列表数据
+    getList(){},
+
+    // 重置搜索
+    resetQuery(){},
+
+    // 0新增、1编辑、2查看
+    handleOption(type,item){
+      this.nowType = type
+      if(type != 0){
+
+      }
+      this.dialogVisible = true
+    },
+
+    //删除
+    handleDelete(){},
 
 
+    //表单提交
+    submitForm(){},
+  }
 }
 }
 </script>
 </script>
 
 

ruoyi-ui/src/views/smartSchool/schoolProperty/outboundLedger/index.vue

 <template>
 <template>
-    <div>
-        <h2>出库台帐</h2>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="80px">
+      <el-form-item label="设备名称" prop="studentName">
+        <el-input v-model="queryParams.xc" placeholder="请输入设备名称" clearable/>
+      </el-form-item>
+      <el-form-item label="归属类型" prop="examType">
+        <el-select v-model="queryParams.xc" placeholder="请选择归属类型" clearable>
+          <el-option v-for="(item,index) in dict.type.exam_type" :key="index"
+                     :label="item.label" :value="item.value"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="分类编码" prop="studentName">
+        <el-input v-model="queryParams.xc" placeholder="请输入分类编码" clearable/>
+      </el-form-item>
+      <el-form-item label="设备状态" prop="examType">
+        <el-select v-model="queryParams.xc" placeholder="请选择设备状态" clearable>
+          <el-option v-for="(item,index) in dict.type.exam_type" :key="index"
+                     :label="item.label" :value="item.value"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="getList">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+    <el-table v-loading="loading" :data="outBoundData" stripe>
+      <el-table-column type="selection" width="55"></el-table-column>
+      <el-table-column label="序号" type="index" width="55" align="center"/>
+      <el-table-column label="出库类型" align="center" prop="studentName"/>
+      <el-table-column label="设备名称" align="center" prop="studentNumber"/>
+      <el-table-column label="型号" align="center" prop="studentNumber"/>
+      <el-table-column label="规格" align="center" prop="studentNumber"/>
+      <el-table-column label="分类编码" align="center" prop="studentNumber"/>
+      <el-table-column label="单位" align="center" prop="studentNumber"/>
+      <el-table-column label="归属类型" align="center" prop="studentNumber"/>
+      <el-table-column label="设备状态" align="center" prop="studentNumber"/>
+      <el-table-column label="投产日期" align="center" prop="studentNumber"/>
+      <el-table-column label="价格（元）" align="center" prop="studentNumber"/>
+      <el-table-column label="效用年限（年）" align="center" prop="studentNumber"/>
+      <el-table-column label="地点" align="center" prop="studentNumber"/>
+      <el-table-column label="使用人" align="center" prop="studentNumber"/>
+      <el-table-column label="备注" align="center" prop="studentNumber"/>
+      <el-table-column label="操作" align="center" prop="orgname" width="150">
+        <template slot-scope="{ row }">
+          <el-button type="text" size="small" @click="handleOption(row)">查看</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination ref="pageBlock" v-show="total > 0" :total="total"
+                :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList"/>
+
+    <el-dialog title="详细信息" :visible.sync="dialogVisible" width="50%">
+      <el-form :model="outBoundForm" :rules="outBoundRules" ref="achievementForm"
+               label-width="110px" label-position="right">
+        <el-row :gutter="30">
+          <el-col :span="12">
+            <el-form-item label="出库类型" prop="idCard">
+              <el-input v-model="outBoundForm" placeholder="请输入出库类型" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="归属类型" prop="idCard">
+              <el-input v-model="outBoundForm" placeholder="请输入归属类型" disabled></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="30">
+          <el-col :span="12">
+            <el-form-item label="设备名称" prop="idCard">
+              <el-input v-model="outBoundForm" placeholder="请输入设备名称" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="设备状态" prop="idCard">
+              <el-input v-model="outBoundForm" placeholder="请输入设备状态" disabled></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="30">
+          <el-col :span="12">
+            <el-form-item label="型号" prop="idCard">
+              <el-input v-model="outBoundForm" placeholder="请输入型号" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="投产日期" prop="idCard">
+              <el-input v-model="outBoundForm" placeholder="请输入投产日期" disabled></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="30">
+          <el-col :span="12">
+            <el-form-item label="规格" prop="idCard">
+              <el-input v-model="outBoundForm" placeholder="请输入规格" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="价格（元）" prop="idCard">
+              <el-input v-model="outBoundForm" placeholder="请输入价格" disabled></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="30">
+          <el-col :span="12">
+            <el-form-item label="分类编码" prop="idCard">
+              <el-input v-model="outBoundForm" placeholder="请输入分类编码" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="效用年限（年）" prop="idCard">
+              <el-input v-model="outBoundForm" placeholder="请输入效用年限" disabled></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="30">
+          <el-col :span="12">
+            <el-form-item label="单位" prop="idCard">
+              <el-input v-model="outBoundForm" placeholder="请输入单位" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="使用人" prop="idCard">
+              <el-input v-model="outBoundForm" placeholder="请输入使用人" disabled></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="30">
+          <el-col :span="12">
+            <el-form-item label="地点" prop="idCard">
+              <el-input v-model="outBoundForm" placeholder="请输入地点" disabled></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="30">
+          <el-col :span="24">
+            <el-form-item label="备注" prop="chemistry">
+              <el-input type="textarea" v-model="outBoundForm" placeholder="请输入备注" disabled></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </el-dialog>
   </div>
   </div>
 </template>
 </template>
 
 
 <script>
 <script>
 export default {
 export default {
+  dicts: ['exam_type'],
+  data() {
+    return {
+      queryParams: {
+        xc: '',
+        pageNum: 1,
+        pageSize: 10,
+      },
+      loading: false,
+      total: 0,
+      outBoundData: [
+        {studentName:"studentName"}
+      ],
+      outBoundForm: {},
+      outBoundRules: [],
+      dialogVisible: false,
+    }
+  },
+  methods:{
+    // 获取列表数据
+    getList(){},
+
+    // 重置搜索
+    resetQuery(){},
+
+    // 查看
+    handleOption(type,item){
+      this.dialogVisible = true
+    },
 
 
+    //表单提交
+    submitForm(){},
+  }
 }
 }
 </script>
 </script>