申请人下拉框选择 & 供应商不必填的-线上问题

.env.development

@@ -10,7 +10,7 @@ ENV = 'development'
 # VUE_APP_BASE_API = 'http://192.168.1.56:8082/'
 # 线上测试
 VUE_APP_BASE_API = 'http://tmrwatch.cn:8082/'
-# VUE_APP_BASE_API = 'http://127.0.0.1:8082/'
+# VUE_APP_BASE_API = 'http://10.0.11.208:8082/'
 
 # VUE_APP_BASE_API = 'http://36.155.144.182:18090/'
 

src/views/maintenance/repair/index.vue

@@ -188,7 +188,7 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="牧场：" prop="pastureId" >
-                <el-select v-model="createTempCont.pastureId" placeholder="牧场" class="filter-item" style="width:100%"   @change="change_pasture2" >
+                <el-select key="1"  v-model="createTempCont.pastureId" placeholder="牧场" class="filter-item" style="width:100%"   @change="change_pasture2" >
                   <el-option v-for="item in pastureNameList" :key="item.id" :label="item.name" :value="item.id" />
                 </el-select>
               </el-form-item>
@@ -196,7 +196,7 @@
 
             <el-col :span="8">
               <el-form-item label="责任部门：" prop="departmentId">
-                <el-select v-model="createTempCont.departmentId" placeholder="责任部门" class="filter-item" style="width:100%"   @change="change_depart2">
+                <el-select key="2"  v-model="createTempCont.departmentId" placeholder="责任部门" class="filter-item" style="width:100%"   @change="change_depart2">
                   <el-option v-for="item in departNameList2" :key="item.id" :label="item.name" :value="item.id" />
                 </el-select>
               </el-form-item>
@@ -216,7 +216,7 @@
 
             <el-col :span="8">
               <el-form-item label="申请人：" prop="applicant">
-                <el-select v-model="createTempCont.applicant" placeholder="申请人" class="filter-item" style="width:100%" :disabled="dialogStatus==='see'"  >
+                <el-select key="3"  v-model="createTempCont.applicant" placeholder="申请人" class="filter-item" style="width:100%" @change="changeApplicant" :disabled="dialogStatus==='see'"  >
                   <el-option v-for="item in employeNameList" :key="item.id" :label="item.name" :value="item.id" />
                 </el-select>
               </el-form-item>
@@ -262,7 +262,7 @@
             <el-table-column :key="0" label="序号" align="center" type="index" width="50px" />
             <el-table-column :key="1" label="供应商" prop="providerName" align="center" min-width="80px">
               <template slot-scope="scope">
-                <el-select v-model="scope.row.providerName" filterable placeholder="供应商" class="filter-item" style="width: 120px; margin-top:10px"   >
+                <el-select v-model="scope.row.providerName" filterable clearable  placeholder="供应商" class="filter-item" style="width: 120px; margin-top:10px"   >
                   <el-option v-for="item in providerNameList" :key="item.name" :label="item.name" :value="item.name" />
                 </el-select>
 
@@ -414,6 +414,7 @@
                 </el-select>
               </el-form-item>
             </el-col> -->
+            <!-- TODO: -->
             <el-col :span="8">
               <el-form-item label="维修人:" prop="pickId">
 
@@ -2232,6 +2233,9 @@ export default {
     change_depart2(item) {
       this.createTemp.departmentName = this.departNameList2.find(obj => obj.id == item).name
     },
+    changeApplicant(){
+      this.$forceUpdate(); // 调用此函数方法
+    },
 
     getPendingList() {
       this.pending.getdataListParm.parammaps.pastureName = this.getdataListParm.parammaps.pastureName
@@ -2386,6 +2390,7 @@ export default {
       this.createTemp.departmentId = ''
       this.createTemp.eqClassId = ''
       this.createTemp.remark = ''
+      this.pickNameArr = []
     },
     changePickId(val) {
       if (this.dialogStatus == 'create') {
@@ -2415,6 +2420,7 @@ export default {
 
     add_dialog_save_cont() {
       this.isokDisable = true
+      console.log(this.createTempCont, '点击保存ss')
       setTimeout(() => {
         this.isokDisable = false
       }, 1000)
@@ -2536,11 +2542,16 @@ export default {
               this.$message({ type: 'warning', message: '请检查合同编号是否未填写', duration: 2000 })
               return false
             }
-          }
-          if (this.listAddCont[j].providerName == null || this.listAddCont[j].providerName === '') {
+            if (this.listAddCont[j].providerName == null || this.listAddCont[j].providerName === '') {
             this.$message({ type: 'warning', message: '请检查供应商是否未填写', duration: 2000 })
             return false
+            }
           }
+           // 如果是无合同则金额比填写
+        if (this.listAddCont[j].amount == 0 && this.createTempCont.contract == 0 ) {
+            this.$message({ type: 'warning', message: '请检查: 金额 是否填写', duration: 2000} )
+          return false
+        }
           if (this.listAddCont[j].eqCode == null || this.listAddCont[j].eqCode === '') {
             this.$message({ type: 'warning', message: '请检查设备名称是否未填写', duration: 2000 })
             return false