修改bug

src/views/basicdata/dept/index.vue

@@ -28,6 +28,10 @@
     <el-table v-loading="loading" :data="deptList" row-key="fId" :default-expand-all="false" lazy
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}" :load="getTreeLoad" ref="table">
       <el-table-column prop="fName" label="仓库名称" width="310"></el-table-column>
+      <el-table-column prop="fProperties" label="仓库属性" width="100" :formatter="formatFProperties"></el-table-column>
+      <el-table-column prop="fType" label="仓库类型" width="100" :formatter="formatfType"></el-table-column>
+      <el-table-column prop="fGoodsType" label="货物类型" width="100" :formatter="formatfGoodsType"></el-table-column>
+      <el-table-column prop="fCoverArea" label="占地面积" width="100"></el-table-column>
       <el-table-column prop="fTotalgross" label="库容（吨）" width="100"></el-table-column>
       <el-table-column prop="fLocation" label="库位" width="100">
         <template slot-scope="scope">
@@ -161,6 +165,44 @@
         </el-row>
         <el-row>
           <el-col :span="8">
+            <el-form-item label="仓库属性" prop="fProperties" label-width="82px">
+              <el-select v-model="form.fProperties" multiple collapse-tags style="width:100%" >
+                <el-option
+                v-for="(item, index) in fPropertiesOptions"
+                :key="index.dictValue"
+                :label="item.dictLabel"
+                :value="item.dictValue"
+              />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="仓库类型" prop="fType" label-width="82px">
+              <el-select v-model="form.fType" multiple ollapse-tags style="width:100%">
+                <el-option
+                v-for="(item, index) in fTypeOptions"
+                :key="index.dictValue"
+                :label="item.dictLabel"
+                :value="item.dictValue"
+              />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="货物类型" prop="fGoodsType" label-width="82px">
+              <el-select v-model="form.fGoodsType" multiple ollapse-tags style="width:100%">
+                <el-option
+                v-for="(item, index) in fGoodsTypeOptions"
+                :key="index.dictValue"
+                :label="item.dictLabel"
+                :value="item.dictValue"
+              />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
             <el-form-item label="显示排序" prop="orderNum">
               <el-input-number v-model="form.orderNum" style="width:100%" controls-position="right" :min="0" />
             </el-form-item>
@@ -229,7 +271,13 @@
             </el-form-item>
           </el-col>
         </el-row>
-
+      <el-row>
+          <el-col :span="8">
+            <el-form-item label="占地面积" prop="fCoverArea">
+              <el-input v-model="form.fCoverArea" placeholder="请输入占地面积" @change="nameChange" />
+            </el-form-item>
+          </el-col>
+      </el-row>
         <!--<el-form-item label="状态，默认 T ,正常T 停用F 下拉选择">
           <el-radio-group v-model="form.fStatus">
             <el-radio label="1">请选择字典生成</el-radio>
@@ -325,6 +373,12 @@ export default {
       total: 0,
       // 表格数据
       list: [],
+      //仓库属性
+      fPropertiesOptions:[],
+      //仓库类型
+      fTypeOptions:[],
+      //货物类型
+      fGoodsTypeOptions:[],
       dialogVideoList: false,
       dialogVideo: false,
       //全屏放大
@@ -389,6 +443,15 @@ export default {
       projectIdOptions:[],
     };
   },
+  watch: {
+    // 'form.fProperties'(newValue) {
+    //   // 当仓库属性值发生变化时触发
+    //   // 将多选的属性值转换为逗号分隔的字符串
+    // },
+    // 'form.fType'(newValue){
+
+    // }
+  },
   created() {
     this.getList();
     this.getDicts("sys_normal_disable").then(response => {
@@ -397,6 +460,18 @@ export default {
     this.getDicts("monitor_project").then((response) => {
       this.projectIdOptions = response.data;
     });
+    //仓库属性
+    this.getDicts("warehouse_properties").then((response) => {
+      this.fPropertiesOptions = response.data;
+    });
+    //仓库类型
+    this.getDicts("warehouse_type").then((response) => {
+      this.fTypeOptions = response.data;
+    });
+    //货物类型
+    this.getDicts("data_goods_category").then((response) => {
+      this.fGoodsTypeOptions = response.data;
+    });
     this.username = Cookies.get("userName");
   },
   filters: {
@@ -424,6 +499,17 @@ export default {
         this.loading = false;
       });
     },
+    //仓库属性回显
+    formatFProperties(row,index){
+      // console.log(this.fPropertiesOptions[index]);
+      return this.selectDictLabel(this.fPropertiesOptions, row.fProperties);
+    },
+    formatfType(row){
+      return this.selectDictLabel(this.fTypeOptions, row.fType);
+    },
+    formatfGoodsType(row){
+      return this.selectDictLabel(this.fGoodsTypeOptions, row.fGoodsType);
+    },
     rowView(row) {
       Axios.post("/prod-api/api/LiveBroadcast/getAccessToken").then(res => {
         Axios.post(`/prod-api/api/LiveBroadcast/getToken?productCode=1640070936703286&token=${res.data.data.access_token}`).then(res2 => {
@@ -544,8 +630,10 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
+      console.log('修改');
       this.reset();
       getDept(row.fId).then(response => {
+        console.log(response);
         this.form = response.data;
         this.form.fLocation = this.form.fLocation + ''
         this.form.fCharg = this.form.fCharg + ''
@@ -559,6 +647,10 @@ export default {
     },
     /** 提交按钮 */
     submitForm: function () {
+      this.form.fProperties = this.form.fProperties.join(',');
+      this.form.fType = this.form.fType.join(',');
+      this.form.fGoodsType = this.form.fGoodsType.join(',');
+      console.log(this.form.fProperties,this.form.fType,this.form.fGoodsType);
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.fId != undefined) {