Browse Source

解决BUG

huang_an 2 năm trước cách đây
mục cha
commit
85bdf7db4d

+ 9 - 1
src/components/AssetDialog/categoryDialog.vue

@@ -20,13 +20,21 @@
       <el-col class="tree-col" :span="6">
         <div class="table-add" style="margin-left: 10px"></div>
         <AssetTree
+          @handleNodeClick="handleNodeClick"
+          @setRootId="setRootId"
+          id="0"
+          :paramsType="'type'"
+          ref="treeList"
+          eqDevice="sb"
+        />
+        <!-- <AssetTree
           @handleNodeClick="handleNodeClick"
           @setRootId="setRootId"
           :type="type"
           :paramsType="'type'"
           ref="treeList"
           id="4"
-        />
+        /> -->
       </el-col>
       <el-col :span="18">
         <el-table

+ 1 - 1
src/views/ledgerAssets/boat/edit.vue

@@ -388,7 +388,7 @@
             par.deviceLocationName = par.location
               ? par.location.toString()
               : '';
-            par.extInfo = { ...this.form };
+            par.extInfo = { ...this.form.category.categoryPallet };
             let obj = {};
             par.extInfoSelf.forEach((item) => {
               obj[item.key] = item.value;

+ 22 - 4
src/views/ledgerAssets/mould/components/mouldInformation.vue

@@ -42,10 +42,10 @@
       </el-descriptions-item>
       <el-descriptions-item>
         <template slot="label"> 已冲压次数 </template>
-        {{ categoryMold.startCyTimes }}
-        <!-- <el-form-item label-width="0">
-          <el-input size="small" v-model="categoryMold.startCyTimes"></el-input>
-        </el-form-item> -->
+        <!-- {{ categoryMold.startCyTimes }} -->
+        <el-form-item label-width="0">
+          <el-input size="small" v-model="categoryMold.cyTimes"></el-input>
+        </el-form-item>
       </el-descriptions-item>
       <el-descriptions-item>
         <template slot="label"> 大模体型号 </template>
@@ -61,6 +61,24 @@
 </template>
 <script>
   export default {
+    props: {
+      form: {
+        type: Object,
+        default: {
+          workstation: {}
+        }
+      }
+    },
+    watch: {
+      form: {
+        //监听的对象
+        deep: true, //深度监听设置为 true
+        handler: function (newValue) {
+          console.log(newValue.isPublic);
+          this.categoryMold = newValue.category.categoryMold;
+        }
+      }
+    },
     data() {
       return {
         labelStyle: {

+ 6 - 6
src/views/ledgerAssets/mould/edit.vue

@@ -26,7 +26,7 @@
           <basicInfoVue ref="basicInfoVueRef" />
           <businessInformation ref="businessInformationRef" :form="form" />
           <assetInformation ref="assetInformationRef" :form="form" />
-          <mouldInformation ref="mouldInformationRef" />
+          <mouldInformation ref="mouldInformationRef" :form="form" />
           <warehouseConfigVue ref="warehouseConfigRef" class="ims" />
           <productInfoVue ref="productInfoRef" />
           <planVue ref="planRef" />
@@ -388,7 +388,7 @@
             par.deviceLocationName = par.location
               ? par.location.toString()
               : '';
-            par.extInfo = { ...this.form };
+            par.extInfo = { ...this.form.category.categoryMold };
             let obj = {};
             par.extInfoSelf.forEach((item) => {
               obj[item.key] = item.value;
@@ -480,10 +480,10 @@
         this.$refs.qualityConfigRef.getDetailInfoAugr(
           this.form.category.categoryQms
         );
-        // 模具信息
-        this.$refs.mouldInformationRef.getDetailInfoAugr(
-          this.form.category.categoryMold
-        );
+        // // 模具信息
+        // this.$refs.mouldInformationRef.getDetailInfoAugr(
+        //   this.form.category.categoryMold
+        // );
         // 其他和关联信息
         this.$refs.footerVueRef.getDetailInfoAugr(this.form.category.category);
         // 文档信息

+ 1 - 1
src/views/ledgerAssets/turnoverCar/edit.vue

@@ -390,7 +390,7 @@
             par.deviceLocationName = par.location
               ? par.location.toString()
               : '';
-            par.extInfo = { ...this.form };
+            par.extInfo = { ...this.form.category.categoryVehicle };
             let obj = {};
             par.extInfoSelf.forEach((item) => {
               obj[item.key] = item.value;