소스 검색

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

hhlxayunmei 2 년 전
부모
커밋
f6a33c607d
2개의 변경된 파일12개의 추가작업 그리고 11개의 파일을 삭제
  1. 10
    9
      src/views/awardManagement/components/paymentdetailsDialog.vue
  2. 2
    2
      vue.config.js

+ 10
- 9
src/views/awardManagement/components/paymentdetailsDialog.vue 파일 보기

78
             <el-input type="textarea" :autosize="{ minRows: 6 }" v-model="arbitrateRecordt.responCrossOpin" placeholder="请输入" />
78
             <el-input type="textarea" :autosize="{ minRows: 6 }" v-model="arbitrateRecordt.responCrossOpin" placeholder="请输入" />
79
           </el-form-item>
79
           </el-form-item>
80
         <el-form-item label="审核意见:" prop="checkOpinion" v-if="flag == 2">
80
         <el-form-item label="审核意见:" prop="checkOpinion" v-if="flag == 2">
81
-          <el-input type="textarea" autosize placeholder="请输入内容" v-model="arbitrateRecordt.checkOpinion" />
81
+          <el-input type="textarea" autosize placeholder="请输入内容" v-model="arbitrateRecord.checkOpinion" />
82
         </el-form-item>
82
         </el-form-item>
83
       </el-form>
83
       </el-form>
84
       <!-- 画布 -->
84
       <!-- 画布 -->
115
       arbitrateRecordt: {},
115
       arbitrateRecordt: {},
116
       form: {},
116
       form: {},
117
       arbitrateRecord: {
117
       arbitrateRecord: {
118
-        checkOpinion:"同意"
118
+        // checkOpinion:"同意"
119
+        checkOpinion:""
119
       },
120
       },
120
       // 表单校验
121
       // 表单校验
121
       rules: {
122
       rules: {
189
             (this.respondenPathArr = []), //被申请人
190
             (this.respondenPathArr = []), //被申请人
190
             (this.awardFileArr = []), //裁决书
191
             (this.awardFileArr = []), //裁决书
191
             (this.awardPathArr = []), //裁决书
192
             (this.awardPathArr = []), //裁决书
192
-            setTimeout(() => {
193
+            // setTimeout(() => {
193
               this.form = this.detailform;
194
               this.form = this.detailform;
194
-              console.log(this.detailform)
195
-              if(this.form.arbitrateRecord && this.form.arbitrateRecord.checkOpinion == null ){
196
-                this.form.arbitrateRecord.checkOpinion = '同意'
197
-              }
198
-              this.arbitrateRecord = this.form.arbitrateRecord;
195
+              // if(this.form.arbitrateRecord && this.form.arbitrateRecord.checkOpinion == null ){
196
+                // this.form.arbitrateRecord.checkOpinion = '同意';
197
+                this.arbitrateRecord.checkOpinion = '';
198
+              // }
199
+              // this.arbitrateRecord = this.form.arbitrateRecord;
199
               this.evidenceFile(this.form);
200
               this.evidenceFile(this.form);
200
-            }, 1000);
201
+            // }, 1000);
201
         }
202
         }
202
       },
203
       },
203
     },
204
     },

+ 2
- 2
vue.config.js 파일 보기

11
 
11
 
12
 const port = process.env.port || process.env.npm_config_port || 80 // 端口
12
 const port = process.env.port || process.env.npm_config_port || 80 // 端口
13
 
13
 
14
-// const API = 'http://121.40.189.20:9001'  //生产
15
-const API = 'http://121.40.189.20:8001'  //测试
14
+const API = 'http://121.40.189.20:9001'  //生产
15
+// const API = 'http://121.40.189.20:8001'  //测试
16
 // const API = 'http://192.168.3.18:9001'  //B
16
 // const API = 'http://192.168.3.18:9001'  //B
17
 // const API = 'http://192.168.3.77:9001' //Q
17
 // const API = 'http://192.168.3.77:9001' //Q
18
 
18