前后:合同保存判断;修改loading

src/dashoo.cn/backend/api/controllers/oilcontract/contractReview.go

@@ -274,6 +274,15 @@ func (this *OilContractReviewController) AddEntity() {
 	var items3 []contractEvaluationItems.OilContractEvaluationItems
 	var items4 []contractEvaluationItems.OilContractEvaluationItems // 业务处室发起评价
 
+	var errinfo ErrorDataInfo
+	if len(modeVO.Items) == 0 {
+		errinfo.Message = "操作失败！评价细项信息不完整！"
+		errinfo.Code = -1
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+		return
+	}
+
 	// 新增配置项
 	for i, v := range modeVO.Items {
 		fmt.Print(i)
@@ -354,7 +363,6 @@ func (this *OilContractReviewController) AddEntity() {
 		}
 	}
 
-	var errinfo ErrorDataInfo
 	if err == nil && errBool == false {
 		//新增
 		errinfo.Message = "添加成功！"

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-basis/_opera/evaluate.vue

@@ -42,10 +42,10 @@
 
           <el-button type="primary" size="mini"
                      v-if="((Number(formData.Status) <= 0 && saveButton) || ((formData.Status == '3' || formData.Status == '4' || formData.Status == '7') && auditBtn)) && (formData.IsBusiness != 1 && byBus != 1)"
-                     @click="onSeaveBigAdd(1)">保存</el-button>
+                     @click="onSeaveBigAdd(1)" :loading="saveLoading">保存</el-button>
           <el-button type="primary" size="mini"
                      v-if="((Number(formData.Status) <=0 && saveButtonForBusiness) || (formData.Status == '4' && saveButtonForBusinessAudit) || (formData.Status == '7' && saveButtonForBusiness)) && (formData.IsBusiness == 1 || byBus == 1)"
-                     @click="onSaveEvaByBusiness(1)">保存</el-button> <!-- 处室保存 -->
+                     @click="onSaveEvaByBusiness(1)" :loading="saveLoading">保存</el-button> <!-- 处室保存 -->
           <el-button @click="onBack" type="primary" size="mini" style="margin-left: 8px">返回</el-button>
         </span>
       </div>
@@ -276,6 +276,7 @@ export default {
         Id: 0,
         Status: '0'
       },
+      saveLoading: false,
       auditstepcode: '',
       contractData: {}, // 合同信息
       // 下拉选择项
@@ -692,6 +693,7 @@ export default {
     },
     // 编辑评价
     updateEvaluate (val, isBusiness) {
+      this.saveLoading = true
       var formData = {
         ContractId: this.contractData.Id,
         Items: this.evaluation_list,
@@ -707,6 +709,7 @@ export default {
               message: res.data.message
             })
           }
+          this.saveLoading = false
           this.refreshPage()
         }
       }).catch(err => {

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-goods/_opera/evaluate.vue

@@ -42,10 +42,10 @@
 
           <el-button type="primary" size="mini"
                      v-if="((Number(formData.Status) <= 0 && saveButton) || ((formData.Status == '3' || formData.Status == '4' || formData.Status == '7') && auditBtn)) && (formData.IsBusiness != 1 && byBus != 1)"
-                     @click="onSeaveBigAdd(1)">保存</el-button>
+                     @click="onSeaveBigAdd(1)" :loading="saveLoading">保存</el-button>
           <el-button type="primary" size="mini"
                      v-if="((Number(formData.Status) <=0 && saveButtonForBusiness) || (formData.Status == '4' && saveButtonForBusinessAudit) || (formData.Status == '7' && saveButtonForBusiness)) && (formData.IsBusiness == 1 || byBus == 1)"
-                     @click="onSaveEvaByBusiness(1)">保存</el-button> <!-- 处室保存 -->
+                     @click="onSaveEvaByBusiness(1)" :loading="saveLoading">保存</el-button> <!-- 处室保存 -->
           <el-button @click="onBack" type="primary" size="mini" style="margin-left: 8px">返回</el-button>
         </span>
       </div>
@@ -273,6 +273,7 @@ export default {
       formData: {
         Id: ''
       },
+      saveLoading: false,
       auditstepcode: '',
       contractData: {}, // 合同信息
       // 下拉选择项
@@ -691,6 +692,7 @@ export default {
     },
     // 编辑评价
     updateEvaluate (val, isBusiness) {
+      this.saveLoading = true
       var formData = {
         ContractId: this.contractData.Id,
         Items: this.evaluation_list,
@@ -705,6 +707,7 @@ export default {
               message: res.data.message
             })
           }
+          this.saveLoading = false
           this.refreshPage()
         }
       }).catch(err => {

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-service/_opera/evaluate.vue

@@ -42,10 +42,10 @@
 
           <el-button type="primary" size="mini"
                      v-if="((Number(formData.Status) <=0 && saveButton) || ((formData.Status == '3' || formData.Status == '4' || formData.Status == '7') && auditBtn)) && (formData.IsBusiness != 1 && byBus != 1)"
-                     @click="onSeaveBigAdd(1)">保存</el-button>
+                     @click="onSeaveBigAdd(1)" :loading="saveLoading">保存</el-button>
           <el-button type="primary" size="mini"
                      v-if="((Number(formData.Status) <=0 && saveButtonForBusiness) || (formData.Status == '4' && saveButtonForBusinessAudit) || (formData.Status == '7' && saveButtonForBusiness)) && (formData.IsBusiness == 1 || byBus == 1)"
-                     @click="onSaveEvaByBusiness(1)">保存</el-button> <!-- 处室保存 -->
+                     @click="onSaveEvaByBusiness(1)" :loading="saveLoading">保存</el-button> <!-- 处室保存 -->
           <el-button @click="onBack" type="primary" size="mini" style="margin-left: 8px">返回</el-button>
         </span>
       </div>
@@ -275,6 +275,7 @@ export default {
       formData: {
         Id: ''
       },
+      saveLoading: false,
       auditstepcode: '',
       contractData: {}, // 合同信息
       // 下拉选择项
@@ -695,6 +696,7 @@ export default {
     },
     // 编辑评价
     updateEvaluate (val, isBusiness) {
+      this.saveLoading = true
       var formData = {
         ContractId: this.contractData.Id,
         Items: this.evaluation_list,
@@ -709,6 +711,7 @@ export default {
               message: res.data.message
             })
           }
+          this.saveLoading = false
           this.refreshPage()
         }
       }).catch(err => {