Merge branch 'hhl' of SH-Arbitrate/Arbitrate-Frontend into dev

src/views/awardManagement/components/paymentdetailsDialog.vue

@@ -78,7 +78,7 @@
             <el-input type="textarea" :autosize="{ minRows: 6 }" v-model="arbitrateRecordt.responCrossOpin" placeholder="请输入" />
           </el-form-item>
         <el-form-item label="审核意见：" prop="checkOpinion" v-if="flag == 2">
-          <el-input type="textarea" autosize placeholder="请输入内容" v-model="arbitrateRecordt.checkOpinion" />
+          <el-input type="textarea" autosize placeholder="请输入内容" v-model="arbitrateRecord.checkOpinion" />
         </el-form-item>
       </el-form>
       <!-- 画布 -->
@@ -115,7 +115,8 @@ export default {
       arbitrateRecordt: {},
       form: {},
       arbitrateRecord: {
-        checkOpinion:"同意"
+        // checkOpinion:"同意"
+        checkOpinion:""
       },
       // 表单校验
       rules: {
@@ -189,15 +190,15 @@ export default {
             (this.respondenPathArr = []), //被申请人
             (this.awardFileArr = []), //裁决书
             (this.awardPathArr = []), //裁决书
-            setTimeout(() => {
+            // setTimeout(() => {
               this.form = this.detailform;
-              console.log(this.detailform)
-              if(this.form.arbitrateRecord && this.form.arbitrateRecord.checkOpinion == null ){
-                this.form.arbitrateRecord.checkOpinion = '同意'
-              }
-              this.arbitrateRecord = this.form.arbitrateRecord;
+              // if(this.form.arbitrateRecord && this.form.arbitrateRecord.checkOpinion == null ){
+                // this.form.arbitrateRecord.checkOpinion = '同意';
+                this.arbitrateRecord.checkOpinion = '';
+              // }
+              // this.arbitrateRecord = this.form.arbitrateRecord;
               this.evidenceFile(this.form);
-            }, 1000);
+            // }, 1000);
         }
       },
     },

vue.config.js

@@ -11,8 +11,8 @@ const name = process.env.VUE_APP_TITLE || '智慧仲裁管理系统' // 网页
 
 const port = process.env.port || process.env.npm_config_port || 80 // 端口
 
-// const API = 'http://121.40.189.20:9001'  //生产
-const API = 'http://121.40.189.20:8001'  //测试
+const API = 'http://121.40.189.20:9001'  //生产
+// const API = 'http://121.40.189.20:8001'  //测试
 // const API = 'http://192.168.3.18:9001'  //B
 // const API = 'http://192.168.3.77:9001' //Q