8/26 工位组别修改

src/views/basic/workplace/workplaceManage.vue

@@ -552,21 +552,27 @@
         <el-row :gutter="20" class="el-row" type="flex">
           <el-col class="el-col">
             <el-form-item label="上级菜单" prop="parentCode">
-              <el-select v-model="subData.parentCode" placeholder="选择上级菜单"
+              <!--<el-select v-model="subData.parentCode" placeholder="选择上级菜单"-->
-                         style="width: 80%"
+              <!--           style="width: 80%"-->
-                         clearable
+              <!--           clearable-->
+              <!--           disabled-->
+              <!--&gt;-->
+              <!--  <el-option-->
+              <!--    v-for="item in fromDeptOptions"-->
+              <!--    :key="item.parentCode"-->
+              <!--    :label="item.parentName"-->
+              <!--    :value="item.parentCode"-->
+              <!--  >-->
+              <!--    <span style="float: left">{{ item.parentName }}</span>-->
+              <!--  </el-option>-->
+              <!--</el-select>-->
+              <el-input
+                v-model="subData.parentName" style="width: 80%"
+                placeholder="全部"
+                auto-complete="off"
                 disabled
               >
-                <el-option
+              </el-input>
-                  v-for="item in fromDeptOptions"
-                  :key="item.parentCode"
-                  :label="item.parentName"
-                  :value="item.parentCode"
-                >
-                  <span style="float: left">{{ item.parentName }}</span>
-                </el-option>
-              </el-select>
-
             </el-form-item>
           </el-col>
 
@@ -696,7 +702,7 @@ export default {
         chargeUser: null,
         constituencies: null,
         invRemindNumber: 0,
-        remake: null,
+        remake: null
       },
       workplaceCode: '6001',
       unitStorageList: [],
@@ -752,7 +758,7 @@ export default {
       },
       inoutTypes: {
         1: '入库',
-        2: '出库',
+        2: '出库'
       },
       corpTypeMap: {
         1: '客户',
@@ -767,7 +773,7 @@ export default {
       },
       orderCirTypes: {
         1: '流通计量单位',
-        2: '使用计量单位',
+        2: '使用计量单位'
       },
       workplaceStatusMap: {
         0: '暂停',
@@ -800,7 +806,10 @@ export default {
         edit: '编辑'
       },
       subFormVisible: false,
-      subData: {},
+      subData: {
+        parentName: '全部',
+        parentCode: '1001'
+      },
       groupData: null,
       total: 0,
       userTotal: 0,
@@ -862,10 +871,10 @@ export default {
         workplaceType: 3,
         deptCode: null,
         chargeUser: null,
-        constituencies: "1001",
+        constituencies: '1001',
         invRemindNumber: 0,
-        remake: null,
+        remake: null
-      };
+      }
       if (this.groupData != null) {
         this.formData.constituencies = this.groupData.code
       }
@@ -1238,10 +1247,10 @@ export default {
       }).then(() => {
         removeBusTypeById(row).then(res => {
           if (res.code == 20000) {
-            this.$message.success('移除成功')
+            this.$message.success('删除成功')
             this.getWorkBindBusTypes()
           } else {
-            this.$message.error("移除失败")
+            this.$message.error('删除失败')
           }
         })
       }).catch(() => {