|  | @@ -11,6 +11,7 @@
 | 
	
		
			
				|  |  |          ref="form"
 | 
	
		
			
				|  |  |          :model="form"
 | 
	
		
			
				|  |  |          label-width="110px"
 | 
	
		
			
				|  |  | +        :rules="rules"
 | 
	
		
			
				|  |  |        >
 | 
	
		
			
				|  |  |          <el-row>
 | 
	
		
			
				|  |  |            <el-col :span="6">
 | 
	
	
		
			
				|  | @@ -124,13 +125,24 @@
 | 
	
		
			
				|  |  |              </el-form-item>
 | 
	
		
			
				|  |  |            </el-col>
 | 
	
		
			
				|  |  |            <el-col :span="6">
 | 
	
		
			
				|  |  | -            <div style="display: flex;justify-content: flex-end">
 | 
	
		
			
				|  |  | -              <el-button
 | 
	
		
			
				|  |  | -                type="primary"
 | 
	
		
			
				|  |  | -                v-if="!isDisabled"
 | 
	
		
			
				|  |  | -              >查询</el-button>
 | 
	
		
			
				|  |  | -            </div>
 | 
	
		
			
				|  |  | +            <el-form-item label="变更原因" prop="remark">
 | 
	
		
			
				|  |  | +              <el-input
 | 
	
		
			
				|  |  | +                placeholder="请输入变更原因"
 | 
	
		
			
				|  |  | +                size="small"
 | 
	
		
			
				|  |  | +                style="width: 100%"
 | 
	
		
			
				|  |  | +                :disabled="disabledtwo"
 | 
	
		
			
				|  |  | +                v-model="form.remark"
 | 
	
		
			
				|  |  | +              ></el-input>
 | 
	
		
			
				|  |  | +            </el-form-item>
 | 
	
		
			
				|  |  |            </el-col>
 | 
	
		
			
				|  |  | +<!--          <el-col :span="6">-->
 | 
	
		
			
				|  |  | +<!--            <div style="display: flex;justify-content: flex-end">-->
 | 
	
		
			
				|  |  | +<!--              <el-button-->
 | 
	
		
			
				|  |  | +<!--                type="primary"-->
 | 
	
		
			
				|  |  | +<!--                v-if="!isDisabled"-->
 | 
	
		
			
				|  |  | +<!--              >查询</el-button>-->
 | 
	
		
			
				|  |  | +<!--            </div>-->
 | 
	
		
			
				|  |  | +<!--          </el-col>-->
 | 
	
		
			
				|  |  |          </el-row>
 | 
	
		
			
				|  |  |        </el-form>
 | 
	
		
			
				|  |  |  
 | 
	
	
		
			
				|  | @@ -712,6 +724,12 @@ export default {
 | 
	
		
			
				|  |  |    },
 | 
	
		
			
				|  |  |    data() {
 | 
	
		
			
				|  |  |      return {
 | 
	
		
			
				|  |  | +      // 校验
 | 
	
		
			
				|  |  | +      rules: {
 | 
	
		
			
				|  |  | +        remark: [
 | 
	
		
			
				|  |  | +          {required: true, message: ' ', trigger: 'blur'}
 | 
	
		
			
				|  |  | +        ]
 | 
	
		
			
				|  |  | +      },
 | 
	
		
			
				|  |  |        // 控制弹出框显示隐藏
 | 
	
		
			
				|  |  |        showDialog: false,
 | 
	
		
			
				|  |  |        // 折叠面板激活
 | 
	
	
		
			
				|  | @@ -897,7 +915,6 @@ export default {
 | 
	
		
			
				|  |  |          fBilltype: this.form.fBilltype,
 | 
	
		
			
				|  |  |          fStltypeid: 1,
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  | -      console.log(list)
 | 
	
		
			
				|  |  |        this.formfeesList.push(list)
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  |      //变更按钮
 | 
	
	
		
			
				|  | @@ -942,31 +959,43 @@ export default {
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  |      // 保存
 | 
	
		
			
				|  |  |      handleSave() {
 | 
	
		
			
				|  |  | -      let data = {
 | 
	
		
			
				|  |  | -        warehouseId: this.warehouseId,
 | 
	
		
			
				|  |  | -        items: this.formfeesList,
 | 
	
		
			
				|  |  | -        itemDel: [],
 | 
	
		
			
				|  |  | -        fDc: this.fDc,
 | 
	
		
			
				|  |  | -      }
 | 
	
		
			
				|  |  | -      data = Object.assign({}, this.form, data)
 | 
	
		
			
				|  |  | -      saveWarehouseModify(data).then(res => {
 | 
	
		
			
				|  |  | -        this.form = res.data;
 | 
	
		
			
				|  |  | -        this.formfeesList = this.form.items
 | 
	
		
			
				|  |  | -        this.$message.success(res.msg)
 | 
	
		
			
				|  |  | +      this.$refs.form.validate(valid => {
 | 
	
		
			
				|  |  | +        if (valid) {
 | 
	
		
			
				|  |  | +          let data = {
 | 
	
		
			
				|  |  | +            warehouseId: this.warehouseId,
 | 
	
		
			
				|  |  | +            items: this.formfeesList,
 | 
	
		
			
				|  |  | +            itemDel: [],
 | 
	
		
			
				|  |  | +            fDc: this.fDc,
 | 
	
		
			
				|  |  | +          }
 | 
	
		
			
				|  |  | +          data = Object.assign({}, this.form, data)
 | 
	
		
			
				|  |  | +          saveWarehouseModify(data).then(res => {
 | 
	
		
			
				|  |  | +            this.form = res.data;
 | 
	
		
			
				|  |  | +            this.formfeesList = this.form.items
 | 
	
		
			
				|  |  | +            this.$message.success(res.msg)
 | 
	
		
			
				|  |  | +          })
 | 
	
		
			
				|  |  | +        } else {
 | 
	
		
			
				|  |  | +          return false
 | 
	
		
			
				|  |  | +        }
 | 
	
		
			
				|  |  |        })
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  |      pleaseCheckHandle() {
 | 
	
		
			
				|  |  | -      // this.handleSave()
 | 
	
		
			
				|  |  | -      let data = {
 | 
	
		
			
				|  |  | -        warehouseId: this.warehouseId,
 | 
	
		
			
				|  |  | -        items: this.formfeesList,
 | 
	
		
			
				|  |  | -        itemDel: [],
 | 
	
		
			
				|  |  | -        fDc: this.fDc,
 | 
	
		
			
				|  |  | -      }
 | 
	
		
			
				|  |  | -      data = Object.assign({}, this.form, data)
 | 
	
		
			
				|  |  | -      checkWarehouseModify(data).then(res => {
 | 
	
		
			
				|  |  | -        this.$message.success(res.msg)
 | 
	
		
			
				|  |  | -        this.showDialog = false
 | 
	
		
			
				|  |  | +      this.$refs.form.validate(valid => {
 | 
	
		
			
				|  |  | +        if (valid) {
 | 
	
		
			
				|  |  | +          // this.handleSave()
 | 
	
		
			
				|  |  | +          let data = {
 | 
	
		
			
				|  |  | +            warehouseId: this.warehouseId,
 | 
	
		
			
				|  |  | +            items: this.formfeesList,
 | 
	
		
			
				|  |  | +            itemDel: [],
 | 
	
		
			
				|  |  | +            fDc: this.fDc,
 | 
	
		
			
				|  |  | +          }
 | 
	
		
			
				|  |  | +          data = Object.assign({}, this.form, data)
 | 
	
		
			
				|  |  | +          checkWarehouseModify(data).then(res => {
 | 
	
		
			
				|  |  | +            this.$message.success(res.msg)
 | 
	
		
			
				|  |  | +            this.showDialog = false
 | 
	
		
			
				|  |  | +          })
 | 
	
		
			
				|  |  | +        } else {
 | 
	
		
			
				|  |  | +          return false
 | 
	
		
			
				|  |  | +        }
 | 
	
		
			
				|  |  |        })
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  |      addOrUpdateHandle(status) {
 |