Merge branch 'purchaseDev' of http://172.16.100.139/new-business/drp-web into purchaseDev

src/views/purchase/PurchaseDemandList/add.vue

@@ -256,7 +256,7 @@
             </el-table-column>
             <el-table-column show-overflow-tooltip label="预留周期" align="center" prop="reservedPeriod" width="150px">
               <template slot-scope="scope">
-                <el-form-item class="hang" :prop="'puDemandItemList.' + scope.$index + '.' + 'reservedPeriod'" :rules="{ required: isYl, message: '请填写预留周期', trigger: 'blur' }">
+                <el-form-item class="hang" :prop="'puDemandItemList.' + scope.$index + '.' + 'reservedPeriod'" :rules="{ required: scope.row.reservedProportion !== '', message: '请填写预留周期', trigger: 'blur' }">
                   <el-input type="number" min="0" clearable :readonly="sonDisable" size="mini" v-model="scope.row.reservedPeriod"></el-input>
                 </el-form-item>
               </template>
@@ -810,14 +810,18 @@ export default {
       if(this.basicForm.puDemandItemList.length !== 0) {
         this.$refs['basic'].validate((valid) => {
           if(valid) {
+            this.$modal.loading("保存中...");
             if(this.sonPageStu == 'add') {
               this.handleData()
               addDemand(this.basicForm).then(res => {
                 console.log(333)
                 if (res.code === 200) {
                   this.$modal.msgSuccess("保存成功");
+                  this.$modal.closeLoading();
                   this.back()
                 }
+              }).catch(err => {
+                this.$modal.closeLoading();
               })
             } else if (this.sonPageStu == 'edit') {
               let list = []
@@ -830,8 +834,11 @@ export default {
               editDemand(param).then(res => {
                 if (res.code === 200) {
                   this.$modal.msgSuccess("编辑成功");
+                  this.$modal.closeLoading();
                   this.back()
                 }
+              }).catch(err => {
+                this.$modal.closeLoading();
               })
             }
           }