优化

src/views/factoryModel/plant/index.vue

@@ -26,7 +26,10 @@
           </el-button>
         </template>
         <template v-slot:factory="{ row }">
-          {{ showgfactory(row) }}
+          {{ showgfactory(row, 1) }}
+        </template>
+        <template v-slot:parent="{ row }">
+          {{ showgfactory(row, 2) }}
         </template>
         <template v-slot:enabled="{ row }">
           {{ dict.enabled[row.enabled] }}
@@ -104,6 +107,12 @@
             prop: 'extInfo.parentId',
             slot: 'factory'
           },
+          {
+            label: '工厂编码',
+            prop: 'parent[0].id',
+            slot: 'parent'
+           
+          },
           {
             label: '省/市/区',
             prop: 'extInfo.location'
@@ -163,11 +172,14 @@
         });
       },
       // 回显工厂名称
-      showgfactory (row) {
+      showgfactory (row, type) {
         let result = row.parent.find((n) => n.id == row.parentId);
-        if (result) {
+        if (result && type == 1) {
           return result.name;
-        } else {
+        } else if(result && type == 2) {
+          return result.code;
+        }
+        else {
           return '';
         }
       },

src/views/system/organization/components/org-user-edit.vue

@@ -5,7 +5,7 @@
     :visible="visible"
     :close-on-click-modal="true"
     custom-class="ele-dialog-form"
-    :title="isUpdate ? '修改用户' : '添加用户'"
+    :title="isUpdate ? '修改人员' : '添加人员'"
     @update:visible="updateVisible"
   >
     <el-form ref="form" :model="form" :rules="rules" label-width="82px">

src/views/technology/route/components/user-edit.vue

@@ -41,20 +41,23 @@
             </el-select>
           </el-form-item>
         </el-col>
+
+        <el-col :span="8">
+          <el-form-item label="产品名称:" prop="categoryName">
+            <el-input @click.native="chooseProduct" v-model="form.categoryName" readonly/>
+          </el-form-item>
+        </el-col>
+
         <el-col :span="8">
           <el-form-item label="产品编码:" prop="categoryCode">
              <el-input
-               placeholder="点击选择产品编码"
+               placeholder="自动带入"
                disabled
                v-model="form.categoryCode"
              />
           </el-form-item>
         </el-col>
-        <el-col :span="8">
-          <el-form-item label="产品名称:" prop="categoryName">
-            <el-input @click.native="chooseProduct" v-model="form.categoryName" readonly/>
-          </el-form-item>
-        </el-col>
+
         <el-col :span="8">
           <el-form-item label="工艺路线版本:" prop="version">
             <el-input disabled v-model="form.version" />