Merge branch 'newprotect' of http://gitlab.91isoft.com:90/yangshuo/template_vue into newprotect

src/views/equipment/check.vue

@@ -158,10 +158,10 @@
         <el-form-item label="厚度：" prop="thickness">
           <el-input v-model.trim="singleDetails.thickness" :readonly="true" />
         </el-form-item>
-        <el-form-item label="创建时间：" prop="createTime">
-          <el-input v-model.trim="singleDetails.createTime" :readonly="true" />
+        <el-form-item label="操作时间：" prop="createTime">
+          {{ singleDetails.createTime | transformDateByFormat('YYYY-MM-DD HH:mm') }}
         </el-form-item>
-        <el-form-item label="创建人：" prop="createBy">
+        <el-form-item label="操作员：" prop="createBy">
           <el-input v-model.trim="singleDetails.createBy" :readonly="true" />
         </el-form-item>
       </el-form>
@@ -194,7 +194,7 @@ export default {
       openDetails: false,
       // TODO: 模拟测试数据
       equipmentList: [{ equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '002', lot: 'xxx', location: '位置02', thickness: '70', createBy: '操作员02', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }],
-      check: '盘点',
+      check: '开始盘点',
       typeParent: 'text',
       typePrimary: 'primary',
       typeSuccess: 'success',

src/views/equipment/management.vue

@@ -45,7 +45,6 @@
     <div style="padding:5px 10px">
       <div class="mb12 font-small-bold">设备管理列表</div>
       <el-table v-loading="loading" border :data="equipmentList" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" />
         <el-table-column type="index" label="序号" width="80" />
         <el-table-column label="编码" prop="equipmentCode" width="120">
           <template slot-scope="scope">
@@ -67,7 +66,7 @@
             {{ scope.row.thickness || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="创建员" prop="createBy">
+        <el-table-column label="操作员" prop="createBy">
           <template slot-scope="scope">
             {{ scope.row.createBy || '-' }}
           </template>
@@ -138,10 +137,10 @@
         <el-form-item label="厚度：" prop="thickness">
           <el-input v-model.trim="singleDetails.thickness" :readonly="true" />
         </el-form-item>
-        <el-form-item label="创建时间：" prop="createTime">
-          <el-input v-model.trim="singleDetails.createTime" :readonly="true" />
+        <el-form-item label="操作时间：" prop="createTime">
+          {{ singleDetails.createTime | transformDateByFormat('YYYY-MM-DD HH:mm') }}
         </el-form-item>
-        <el-form-item label="创建人：" prop="createBy">
+        <el-form-item label="操作员：" prop="createBy">
           <el-input v-model.trim="singleDetails.createBy" :readonly="true" />
         </el-form-item>
       </el-form>

src/views/equipment/second.vue

@@ -43,6 +43,7 @@
             :name="addProcess"
             :size="smallSize"
             :icon="addIcon"
+            @btn-click="handleAdd"
           />
         </el-form-item>
       </div>
@@ -51,7 +52,6 @@
     <div style="padding:5px 10px">
       <div class="mb12 font-small-bold">设备管理列表</div>
       <el-table v-loading="loading" border :data="processList" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" />
         <el-table-column type="index" label="序号" width="80" />
         <el-table-column label="工序名称" prop="processCode" :show-overflow-tooltip="true">
           <template slot-scope="scope">
@@ -78,12 +78,12 @@
             {{ scope.row.thickness || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="创建人" prop="createBy">
+        <el-table-column label="操作员" prop="createBy">
           <template slot-scope="scope">
             {{ scope.row.createBy || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="创建时间" :show-overflow-tooltip="true" align="center" prop="createTime">
+        <el-table-column label="操作时间" :show-overflow-tooltip="true" align="center" prop="createTime">
           <template slot-scope="scope">
             <span>{{ scope.row.createTime | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
           </template>
@@ -102,36 +102,23 @@
     <!-- 添加或修改设备配置对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
-        <el-form-item label="名称" prop="roleName">
-          <el-input v-model.trim="form.roleName" show-word-limit :maxlength="30" placeholder="请输入设备名称" />
+        <el-form-item label="工序名称" prop="roleKey">
+          <el-input show-word-limit :maxlength="30" placeholder="请输入工序名称" />
         </el-form-item>
-        <el-form-item label="设备来源" prop="roleKey">
-          <el-input v-model.trim="form.roleKey" show-word-limit :maxlength="30" placeholder="请输入设备来源" />
+        <el-form-item label="编码" prop="roleKey">
+          <el-input show-word-limit :maxlength="30" placeholder="请输入设备编码" />
         </el-form-item>
-        <el-form-item label="排序" prop="roleSort">
-          <el-input-number v-model="form.roleSort" style="width: 100%" controls-position="right" :min="0" />
+        <el-form-item label="lot" prop="roleSort">
+          <el-input-number style="width: 100%" controls-position="right" :min="0" />
         </el-form-item>
-        <el-form-item label="设备批次">
-          <el-tree
-            ref="menu"
-            class="tree-border"
-            :data="menuOptions"
-            show-checkbox
-            node-key="id"
-            check-strictly
-            empty-text="加载中，请稍后"
-            :props="defaultProps"
-            @check-change="handleMenuCheckChange"
-          />
+        <el-form-item label="位置" prop="roleName">
+          <el-input show-word-limit :maxlength="30" placeholder="请输入设备位置" />
+        </el-form-item>
+        <el-form-item label="厚度" prop="roleName">
+          <el-input show-word-limit :maxlength="30" placeholder="请输入设备厚度" />
         </el-form-item>
         <el-form-item label="备注">
-          <el-input
-            v-model.trim="form.remark"
-            maxlength="200"
-            show-word-limit
-            type="textarea"
-            placeholder="请输入内容"
-          />
+          <el-input maxlength="200" show-word-limit type="textarea" placeholder="请输入内容" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -515,7 +502,7 @@ export default {
       this.reset()
       this.getMenuTreeselect()
       this.open = true
-      this.title = '添加角色'
+      this.title = '设备入库'
     },
     /** 修改按钮操作 */
     handleUpdate(row) {