优化

src/views/factoryModel/station/components/edit.vue

@@ -15,15 +15,7 @@
               <el-input clearable :maxlength="20" v-model="form.name" placeholder="请输入" />
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item label="所属工厂:" prop="extInfo.factoryId">
-              <el-select v-model="form.extInfo.factoryId" placeholder="请选择" @change="change_factoryId"
-                style="width: 100%">
-                <el-option v-for="item in options_factory" :key="item.id" :label="item.name" :value="item.id">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
+
           <el-col :span="8">
             <el-form-item label="设备编码:" prop="extInfo.assetCode">
               <el-input v-model="form.extInfo.assetCode" readonly @click.native="chooseAsset" />
@@ -34,6 +26,19 @@
               <el-input disabled v-model="form.extInfo.assetName" />
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="所属厂房:" prop="extInfo.factoryId">
+              <el-select v-model="form.extInfo.factoryId" placeholder="请选择" @change="change_factoryId"
+                style="width: 100%">
+                <el-option v-for="item in options_factory" :key="item.id" :label="item.pathName" :value="item.id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+
+ 
+
           <el-col :span="8">
             <el-form-item label="所属车间:" prop="extInfo.workshopId">
               <el-select v-model="form.extInfo.workshopId" placeholder="请选择" style="width: 100%"
@@ -43,6 +48,7 @@
               </el-select>
             </el-form-item>
           </el-col>
+
           <el-col :span="8">
             <el-form-item label="所属产线:" prop="productionLineId">
               <el-select v-model="form.productionLineId"  placeholder="请选择" style="width: 100%"
@@ -52,6 +58,7 @@
               </el-select>
             </el-form-item>
           </el-col>
+
           <el-col :span="8">
             <el-form-item label="负责人部门:" prop="extInfo.principalDep">
               <ele-tree-select clearable :data="options_groupId" filterable  v-model="form.extInfo.principalDep" valueKey="id"
@@ -160,15 +167,11 @@ export default {
   props: {
     options_groupId: {
       type: Array,
-      default() {
-        return [];
-      }
+      default: () => []
     },
     options_factory: {
       type: Array,
-      default() {
-        return [];
-      }
+      default: () => []
     }
   },
   watch: {

src/views/factoryModel/station/index.vue

@@ -33,6 +33,10 @@
             {{ `${row.extInfo.meterTime}  ${row.extInfo.meterTimeUnit}/次 ` }}
           </div>
         </template>
+        <template v-slot:pathName="{ row }">
+          {{  row.pathName}}
+        </template>
+
         <template v-slot:enabled="{ row }">
           {{ dict.enabled[row.enabled] }}
         </template>
@@ -104,6 +108,11 @@
             prop: 'leaderName',
             slot: 'factory'
           },
+          {
+            label: '所属工厂 - 厂房',
+            prop: 'parentId',
+            slot: 'pathName'
+          },
           {
             label: '所属车间',
             prop: 'workshopName'
@@ -163,6 +172,7 @@
       openEdit (type, row) {
         this.$refs.edit.open(type, row);
       },
+
       // 获取公司数据
       getGs () {
         listOrganizations().then((list) => {
@@ -183,7 +193,8 @@
       getFactoryarea () {
         let par = {
           type: 1,
-          size: 9999
+          size: 9999,
+          type: 2,
         };
         getFactoryarea(par).then((res) => {
           this.dict.factory = res.list;

src/views/material/product/detail.vue

@@ -73,6 +73,10 @@
               </DictSelection>
             </el-form-item>
           </el-col>
+
+
+
+          
           <el-col :span="8">
             <el-form-item label="体积">
               <div class="form-line">
@@ -90,6 +94,20 @@
               </div>
             </el-form-item>
           </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="是否消耗材" prop="isConsumable">
+              <el-select
+                v-model="form.isConsumable"
+                size="small"
+                style="width: 100%"
+              >
+                <el-option :value="1" label="是"></el-option>
+                <el-option :value="0" label="否"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
           <el-col :span="8">
             <el-form-item label="净重">
               <div class="form-line">
@@ -187,7 +205,8 @@ export default {
       loading: false,
       form: {
         categoryLevelGroupName: '',
-        categoryLevelName: ''
+        categoryLevelName: '',
+        isConsumable: 1
       },
       remarkform: {
         remarkAttach: []