Merge branch 'master' of http://47.110.251.215:3000/web/saber into master

src/views/certificate/lists/addList.vue

@@ -208,7 +208,7 @@
             placeholder="请选择"
           >
             <el-option
-              v-for="item in ContractSection[key]"
+              v-for="item in form.signPfxDeputieList[key].contractList"
               :key="item.id"
               :label="item.name"
               :value="item.id"
@@ -381,16 +381,25 @@ export default {
       this.form.signatureFileUrl = [file]
     },
     pushSignPfxDeputieList () {//添加关联项目
-      this.form.signPfxDeputieList.unshift({
+      // this.form.signPfxDeputieList.unshift({
+      //   projectId: '',
+      //   contractId: '',
+      //   roleId: '',
+      // })
+
+      this.form.signPfxDeputieList.push({
         projectId: '',
         contractId: '',
         roleId: '',
+        contractList: []
       })
+
     },
     focusContractSection (projectId, key) {//获取合同段数据
       this.projectMeiju.forEach(val => {
         if (val.id == projectId) {
-          this.ContractSection[key] = val.contractInfoList
+          // this.ContractSection[key] = val.contractInfoList
+          this.form.signPfxDeputieList[key].contractList = val.contractInfoList
         }
       })
     },
@@ -436,10 +445,21 @@ export default {
       console.log(res);
       if (res.code == 200) {
         this.projectMeiju = res.data
-        this.form.signPfxDeputieList.forEach((val, key) => {
-          this.ContractSection.push(res.data[key].contractInfoList)
-        })
-        console.log(this.ContractSection);
+        // this.form.signPfxDeputieList.forEach((val, key) => {
+        //   this.ContractSection.push(res.data[key].contractInfoList)
+        // })
+
+        if(this.form.signPfxDeputieList.length > 0){
+            this.form.signPfxDeputieList.forEach((val, key) => {
+              this.projectMeiju.forEach((project, key) => {
+                if(val.projectId == project.id){
+                  val.contractList = project.contractInfoList;
+                }
+              })
+            })
+        }
+
+        console.log(this.form.signPfxDeputieList);
       }
     },
     async findPfxType () {

src/views/manager/projectinfo/editElement/editElement.vue

@@ -313,6 +313,9 @@ export default {
           RightClick (tr, td, x1, x2, y1, y2) {//鼠标右键事件
             _that.RightClick2(tr, td, x1, x2, y1, y2)
           },
+          getInformation(a,b,c) {
+
+          }
         }
       })
       var component = new MyComponent().$mount()
@@ -323,6 +326,11 @@ export default {
       let _that = this
       var MyComponent = await Vue.extend({
         template: localStorage.getItem('editElement'),
+        data () {
+          return {
+            formData: {}
+          }
+        },
         methods: {
           RightClick (tr, td, x1, x2, y1, y2) {//鼠标右键事件
             _that.RightClick2(tr, td, x1, x2, y1, y2)

src/views/manager/projectinfo/treeTemplate/dynamicExcel.vue

@@ -85,8 +85,8 @@ export default {
       var MyComponent = await Vue.extend({
         template: localStorage.getItem('excelHtml'),
         data () {
-          formData: {
-
+          return {
+            formData: {}
           }
         },
         methods: {
@@ -102,12 +102,12 @@ export default {
     async copss () {
       let _that = this
       var MyComponent = await Vue.extend({
-        template: localStorage.getItem('excelHtml'),
         data () {
-          formData: {
-
+          return {
+            formData: {}
           }
         },
+        template: localStorage.getItem('excelHtml'),
         getInformation (name, tr, td) {//鼠标右键事件
           _that.getInformation(name, tr, td)
         },
@@ -176,4 +176,3 @@ export default {
 
 
 
-