苏剧类型，挂锁类型内容

src/views/mes/md/locksettype/index.vue

@@ -7,18 +7,18 @@
       :inline="true"
       v-show="showSearch"
     >
-      <el-form-item label="挂锁类型编码" prop="locksetTypeCode">
+      <el-form-item label="锁具类型编码" prop="locksetTypeCode">
         <el-input
           v-model="queryParams.locksetTypeCode"
-          placeholder="请输入挂锁类型编码"
+          placeholder="请输入锁具类型编码"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="挂锁类型名称" prop="locksetTypeName">
+      <el-form-item label="锁具类型名称" prop="locksetTypeName">
         <el-input
           v-model="queryParams.locksetTypeName"
-          placeholder="请输入挂锁类型名称"
+          placeholder="请输入锁具类型名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -75,17 +75,47 @@
     >
       <el-table-column
         prop="locksetTypeCode"
-        label="挂锁类型编码"
+        label="锁具类型编码"
         width="260"
       ></el-table-column>
       <el-table-column
         prop="locksetTypeName"
-        label="挂锁类型名称"
+        label="锁具类型名称"
         width="260"
       ></el-table-column>
+      <el-table-column
+        label="锁具类型图标"
+        align="center"
+        prop="locksetTypeIcon"
+      >
+        <template slot-scope="scope">
+          <img
+            v-if="scope.row.locksetTypeIcon"
+            :src="scope.row.locksetTypeIcon"
+            alt=""
+            style="width: 50px; height: 50px"
+          />
+          <span v-else>-</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="锁具类型图片"
+        align="center"
+        prop="locksetTypeImg"
+      >
+        <template slot-scope="scope">
+          <img
+            v-if="scope.row.locksetTypeImg"
+            :src="scope.row.locksetTypeImg"
+            alt=""
+            style="width: 50px; height: 50px"
+          />
+          <span v-else>-</span>
+        </template>
+      </el-table-column>
       <el-table-column
         prop="locksetTypeDescription"
-        label="挂锁类型描述"
+        label="锁具类型描述"
         width="260"
       ></el-table-column>
       <el-table-column
@@ -140,24 +170,14 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
-          <el-col :span="18">
-            <el-form-item label="挂锁类型名称" prop="lockTypeName">
-              <el-input
-                style="width: 318px"
-                v-model="form.lockTypeName"
-                placeholder="请输入挂锁类型名称"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
+
         <el-row>
           <el-col :span="19">
-            <el-form-item label="挂锁类型编码" prop="lockTypeCode">
+            <el-form-item label="锁具类型编码" prop="locksetTypeCode">
               <el-input
                 style="width: 318px"
-                v-model="form.lockTypeCode"
-                placeholder="请输入挂锁类型编码"
+                v-model="form.locksetTypeCode"
+                placeholder="请输入锁具类型编码"
               />
             </el-form-item>
           </el-col>
@@ -175,29 +195,48 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="10">
-            <el-form-item label="锁具类型图标" prop="lockTypeIcon">
-            </el-form-item>
-          </el-col>
-          <el-col :span="10">
-            <el-form-item label="挂锁类型描述" prop="lockTypeDescription">
+          <el-col :span="18">
+            <el-form-item label="锁具类型名称" prop="locksetTypeName">
               <el-input
-                type="textarea"
                 style="width: 318px"
-                v-model="form.lockTypeDescription"
-                placeholder="请输入挂锁类型描述"
+                v-model="form.locksetTypeName"
+                placeholder="请输入锁具类型名称"
               />
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="锁具类型图标" prop="locksetTypeIcon">
+              <ImageUpload
+                :limit="1"
+                :value="form.locksetTypeIcon"
+                :fileSize="5"
+                @onUploaded="handleIconUplaoded"
+                @onRemoved="handleIconRemoved"
+              ></ImageUpload>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="锁具类型图片" prop="locksetTypeImg">
+              <ImageUpload
+                :limit="1"
+                :value="form.locksetTypeImg"
+                :fileSize="5"
+                @onUploaded="handleImgUplaoded"
+                @onRemoved="handleImgRemoved"
+              ></ImageUpload>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="10">
-            <el-form-item label="挂锁类型描述" prop="lockTypeDescription">
+            <el-form-item label="锁具类型描述" prop="locksetTypeDescription">
               <el-input
                 type="textarea"
                 style="width: 318px"
-                v-model="form.lockTypeDescription"
-                placeholder="请输入挂锁类型描述"
+                v-model="form.locksetTypeDescription"
+                placeholder="请输入锁具类型描述"
               />
             </el-form-item>
           </el-col>
@@ -280,10 +319,10 @@ export default {
         // ],
 
         locksetTypeCode: [
-          { required: true, message: "挂锁类型编号不能为空", trigger: "blur" },
+          { required: true, message: "锁具类型编号不能为空", trigger: "blur" },
         ],
         locksetTypeName: [
-          { required: true, message: "挂锁类型名称不能为空", trigger: "blur" },
+          { required: true, message: "锁具类型名称不能为空", trigger: "blur" },
         ],
       },
     };
@@ -332,6 +371,8 @@ export default {
         materialsTypeId: 1,
         locksetTypeDescription: undefined,
         locksetTypeCode: undefined,
+        locksetTypeIcon: undefined,
+        locksetTypeIcon: undefined,
       };
       this.autoGenFlag = false;
       this.resetForm("form");
@@ -388,7 +429,7 @@ export default {
       getLockTypeInfo(row.locksetTypeId).then((response) => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改挂锁类型";
+        this.title = "修改锁具类型";
       });
       listLockType().then((response) => {
         this.deptOptions = this.handleTree(
@@ -429,6 +470,37 @@ export default {
         }
       });
     },
+    //图片上传成功
+    handleImgUplaoded(imgUrl) {
+      this.form.locksetTypeImg = imgUrl[0].url;
+    },
+    //图标上传成功
+    handleIconUplaoded(imgUrl) {
+      this.form.locksetTypeIcon = imgUrl[0].url;
+    },
+    handleIconUplaoded1(imgUrl) {
+      this.form.locksetTypeImg = imgUrl[0].url;
+    },
+    //图标上传成功
+    handleIconUplaoded2(imgUrl) {
+      this.form.locksetTypeIcon = imgUrl[0].url;
+    },
+
+    // 图标移除
+    handleIconRemoved(imgUrl) {
+      this.form.locksetTypeIcon = null;
+    },
+    // 图标移除
+    handleIconRemoved1(imgUrl) {
+      this.form.locksetTypeImg = null;
+    },
+    handleIconRemoved2(imgUrl) {
+      this.form.locksetTypeIcon = "";
+    },
+    //图片移除
+    handleImgRemoved(imgUrl) {
+      this.form.locksetTypeImg = null;
+    },
     /** 删除按钮操作 */
     handleDelete(row) {
       this.$modal
@@ -445,7 +517,7 @@ export default {
     //自动生成编码
     handleAutoGenChange(autoGenFlag) {
       if (autoGenFlag) {
-        genCode("LOCK_TYPE_CODE").then((response) => {
+        genCode("LOCK_CODE").then((response) => {
           this.form.locksetTypeCode = response;
         });
       } else {

src/views/mes/md/locktype/index.vue

@@ -151,7 +151,7 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
           <el-col :span="18">
-            <el-form-item label="父级" prop="parentTypeId">
+            <el-form-item label="父类型" prop="parentTypeId">
               <treeselect
                 style="width: 318px"
                 v-model="form.parentTypeId"
@@ -164,6 +164,7 @@
         </el-row>
         <el-form-item label="硬件类型" prop="hardwareTypeId">
           <treeselect
+            style="width: 318px"
             v-model="form.hardwareTypeId"
             :options="machinerytypeOptions"
             :normalizer="normalizer1"
@@ -216,24 +217,30 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-form-item label="挂锁类型图标" prop="lockTypeIcon">
-          <ImageUpload
-            :limit="1"
-            :value="form.lockTypeIcon"
-            :fileSize="5"
-            @onUploaded="handleImgUplaoded"
-            @onRemoved="handleImgRemoved"
-          ></ImageUpload>
-        </el-form-item>
-        <el-form-item label="挂锁类型图片" prop="lockTypeImg">
-          <ImageUpload
-            :limit="1"
-            :value="form.lockTypeImg"
-            :fileSize="5"
-            @onUploaded="handleImgUplaoded1"
-            @onRemoved="handleImgRemoved1"
-          ></ImageUpload>
-        </el-form-item>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="挂锁类型图标" prop="lockTypeIcon">
+              <ImageUpload
+                :limit="1"
+                :value="form.lockTypeIcon"
+                :fileSize="5"
+                @onUploaded="handleImgUplaoded"
+                @onRemoved="handleImgRemoved"
+              ></ImageUpload>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="挂锁类型图片" prop="lockTypeImg">
+              <ImageUpload
+                :limit="1"
+                :value="form.lockTypeImg"
+                :fileSize="5"
+                @onUploaded="handleImgUplaoded1"
+                @onRemoved="handleImgRemoved1"
+              ></ImageUpload>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>