Merge remote-tracking branch 'origin/dev3.0' into dev3.0

src/views/list/addFifth.vue

@@ -1551,7 +1551,7 @@
                         ref="CURRENCY"
                         label="合同币种"
                         prop="CURRENCY"
-                        :rule="[{ required: true, message: '请选择合同币种', trigger: ['blur', 'change'] }]"
+                        :rules="[{ required: true, message: '请选择合同币种', trigger: ['blur', 'change'] }]"
                         style="width: 50%"
                       >
                         <el-select v-model="form.CURRENCY" :disabled="formType === 'examine'" filterable placeholder="请选择">

src/views/list/addFourth.vue

@@ -2758,6 +2758,18 @@ export default {
         this.PROJNAMEDisabled = false
         this.checked = false
       }
+      // 转让前、转让后合同
+      if (this.form.GDXX.length > 0) {
+        this.form.GDXXBefore = []
+        this.form.GDXXAfter = []
+        this.form.GDXX.forEach(item => {
+          if (item.TRANSFERTYPE === '1') {
+            this.form.GDXXBefore.push(item)
+          } else if (item.TRANSFERTYPE === '2') {
+            this.form.GDXXAfter.push(item)
+          }
+        })
+      }
       if (this.form.HTDFXX.length > 0) {
         for (let i = 0, l = this.form.HTDFXX.length; i < l; i++) {
           if (this.form.HTDFXX[i].AUTHORIZEDNAME === null || this.form.HTDFXX[i].AUTHORIZEDNAME === '') {
@@ -3069,9 +3081,11 @@ export default {
       if (this.$route.query.number === '14' && this.form.TZXX.ISGQXXBG === '1') {
         if (this.form.GDXXAfter.length === 0) {
           this.$message.warning('至少要有一条"转让/签订标识"为"协议签订后股东方信息"。')
+          this.saveLoading = false
           return 0
         } else if (this.form.GDXXAfter[0].SHAREHOLDERNAME === '' && this.form.GDXXAfter[0].SHAREHOLDERRATIO === '') {
           this.$message.warning('至少要有一条"转让/签订标识"为"协议签订后股东方信息"。')
+          this.saveLoading = false
           return 0
         }
       }