Merge branch 'master' of http://182.151.8.209:9010/eln_TD/eln_web

src/views/business/comps/template/comps/dl/DL003.vue

@@ -364,6 +364,7 @@ export default {
     },
     getResource() {
       let content = this.getFilledFormData();
+      let formData = this.formData;
       //生成resource
       let tmpResource = []
       let tmpYq = []
@@ -452,16 +453,16 @@ export default {
           }
         }
         tmpYq.push({
-          mc: content.pykssjmc,
-          xh: content.pykssjxh,
+          mc: content.pykssjmc || formData.pykssjmc,
+          xh: content.pykssjxh || formData.pykssjxh,
           bh: content.fssygbh,
-          jzrq: content.pykssjjzrq,
+          jzrq: content.pykssjjzrq || formData.pykssjjzrq,
         })
         tmpYq.push({
-          mc: content.pyxmc,
-          xh: content.pyxxh,
+          mc: content.pyxmc || formData.pyxmc,
+          xh: content.pyxxh || formData.pyxxh,
           bh: content.pyx,
-          jzrq: content.pyxjzrq,
+          jzrq: content.pyxjzrq || formData.pyxjzrq,
         })
         this.yqResourceTmp = tmpYq
       }

src/views/business/comps/template/comps/dl/DL013.vue

@@ -269,7 +269,7 @@ export default {
               subType: 'select',
               subKey: 'xbxytjUnit',
               fillType: 'actFill',
-              subOptions: this.getDictOptions('business_nddw'),
+              subOptions: this.getDictOptions('business_tjdw'),
               maxlength: 10
             }
           }