Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev

@@ -259,7 +259,7 @@ class data extends filter {
               {
               {
                 vm.form.djqx.map(option => {
                 vm.form.djqx.map(option => {
                   return (
                   return (
-                    <el-option label={option.nodename} value={option.bsmSqyw}></el-option>
+                    <el-option label={option.nodename} value={option.nodecode}></el-option>
                   )
                   )
                 })
                 })
               }
               }

 <!--
 <!--
  * @Description:
  * @Description:
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-10-13 13:38:21
+ * @LastEditTime: 2024-01-22 15:49:28
 -->
 -->
 <template>
 <template>
   <div>
   <div>
@@ -111,7 +111,7 @@
           </lb-table>
           </lb-table>
         </el-collapse-item>
         </el-collapse-item>
         <el-collapse-item title="材料信息设置" name="2">
         <el-collapse-item title="材料信息设置" name="2">
-          <lb-table :column="clxxList" :heightNumSetting="true" :minHeight="160"
+          <lb-table :column="clxxList" :heightNumSetting="true" :key="cLkey" :minHeight="160"
             :pagination="false" :data="form.clxx">
             :pagination="false" :data="form.clxx">
           </lb-table>
           </lb-table>
         </el-collapse-item>
         </el-collapse-item>
@@ -169,6 +169,7 @@
     },
     },
     data () {
     data () {
       return {
       return {
+        cLkey: 0,
         loading: false,
         loading: false,
         key: 0,
         key: 0,
         tn: 0,
         tn: 0,
@@ -211,7 +212,6 @@
       }
       }
     },
     },
     methods: {
     methods: {
-      //页面初始化
       /**
       /**
        * @description: 页面初始化
        * @description: 页面初始化
        * @author: renchao
        * @author: renchao
@@ -233,6 +233,7 @@
             }
             }
           })
           })
         }
         }
+        console.log(this.clxxList);
       },
       },
       /**
       /**
        * @description: orderNoChange
        * @description: orderNoChange
@@ -289,7 +290,7 @@
         getSqdjywDetail(bsmSqyw).then((res) => {
         getSqdjywDetail(bsmSqyw).then((res) => {
           if (res.code === 200) {
           if (res.code === 200) {
             this.form = res.result;
             this.form = res.result;
-            console.log(this.form.clxx);
+            console.log(this.form);
             if (that.formData.sqfl == "2") {
             if (that.formData.sqfl == "2") {
               that.form.ywmcList = that.form.djlx.map(item => ({ nodename: item.djywmc + '+' + item.nodename, bsmSqyw: item.bsmSqyw }))
               that.form.ywmcList = that.form.djlx.map(item => ({ nodename: item.djywmc + '+' + item.nodename, bsmSqyw: item.bsmSqyw }))
             }
             }
@@ -384,6 +385,7 @@
        */
        */
       removeDjqx (index, row) {
       removeDjqx (index, row) {
         this.form.djqx.splice(index, 1);
         this.form.djqx.splice(index, 1);
+        this.cLkey++
       },
       },
       /**
       /**
        * @description: addClxx
        * @description: addClxx