|  | @@ -442,7 +442,7 @@
 | 
	
		
			
				|  |  |          <el-row style="margin-top: 30px">
 | 
	
		
			
				|  |  |            <el-col :span="8">
 | 
	
		
			
				|  |  |              <el-form-item label="仓库联系人" prop="fContacts">
 | 
	
		
			
				|  |  | -              <el-select
 | 
	
		
			
				|  |  | +              <!-- <el-select
 | 
	
		
			
				|  |  |                  v-model="form.fContacts"
 | 
	
		
			
				|  |  |                  filterable
 | 
	
		
			
				|  |  |                  remote
 | 
	
	
		
			
				|  | @@ -456,7 +456,12 @@
 | 
	
		
			
				|  |  |                    :label="dict.nickName"
 | 
	
		
			
				|  |  |                    :value="dict.userName"
 | 
	
		
			
				|  |  |                  ></el-option>
 | 
	
		
			
				|  |  | -              </el-select>
 | 
	
		
			
				|  |  | +              </el-select> -->
 | 
	
		
			
				|  |  | +              <el-input
 | 
	
		
			
				|  |  | +                v-model="form.fContacts"
 | 
	
		
			
				|  |  | +                style="width: 250px"
 | 
	
		
			
				|  |  | +                placeholder="仓库联系人"
 | 
	
		
			
				|  |  | +              />
 | 
	
		
			
				|  |  |              </el-form-item>
 | 
	
		
			
				|  |  |            </el-col>
 | 
	
		
			
				|  |  |            <el-col :span="8">
 | 
	
	
		
			
				|  | @@ -523,8 +528,8 @@
 | 
	
		
			
				|  |  |          </el-row>
 | 
	
		
			
				|  |  |          <el-row>
 | 
	
		
			
				|  |  |            <el-col :span="8">
 | 
	
		
			
				|  |  | -            <el-form-item label="经营单位" prop="fsbu">
 | 
	
		
			
				|  |  | -              <el-select
 | 
	
		
			
				|  |  | +            <el-form-item label="单据编号" prop="foriginalbillno">
 | 
	
		
			
				|  |  | +              <!-- <el-select
 | 
	
		
			
				|  |  |                  v-model="form.fSbu"
 | 
	
		
			
				|  |  |                  filterable
 | 
	
		
			
				|  |  |                  remote
 | 
	
	
		
			
				|  | @@ -538,7 +543,12 @@
 | 
	
		
			
				|  |  |                    :label="dict.fName"
 | 
	
		
			
				|  |  |                    :value="dict.fId"
 | 
	
		
			
				|  |  |                  ></el-option>
 | 
	
		
			
				|  |  | -              </el-select>
 | 
	
		
			
				|  |  | +              </el-select> -->
 | 
	
		
			
				|  |  | +              <el-input
 | 
	
		
			
				|  |  | +                v-model="form.fOriginalbillno"
 | 
	
		
			
				|  |  | +                style="width: 250px"
 | 
	
		
			
				|  |  | +                placeholder="单据编号"
 | 
	
		
			
				|  |  | +              />
 | 
	
		
			
				|  |  |              </el-form-item>
 | 
	
		
			
				|  |  |            </el-col>
 | 
	
		
			
				|  |  |            <el-col :span="8">
 | 
	
	
		
			
				|  | @@ -559,7 +569,7 @@
 | 
	
		
			
				|  |  |              </el-form-item>
 | 
	
		
			
				|  |  |            </el-col>
 | 
	
		
			
				|  |  |            <el-col :span="8">
 | 
	
		
			
				|  |  | -            <el-form-item label="制单人111" prop="createBy">
 | 
	
		
			
				|  |  | +            <el-form-item label="制单人" prop="createBy">
 | 
	
		
			
				|  |  |                <el-input
 | 
	
		
			
				|  |  |                  disabled
 | 
	
		
			
				|  |  |                  v-model="form.createBy"
 | 
	
	
		
			
				|  | @@ -2194,124 +2204,135 @@ export default {
 | 
	
		
			
				|  |  |      /** 修改按钮操作 */
 | 
	
		
			
				|  |  |      handleUpdate(row) {
 | 
	
		
			
				|  |  |        this.reset();
 | 
	
		
			
				|  |  | -      const fId = row.fid || this.ids;
 | 
	
		
			
				|  |  | -      getWarehousebills(row.fid).then((response) => {
 | 
	
		
			
				|  |  | +      const fId = row.fId || this.ids;
 | 
	
		
			
				|  |  | +      getWarehousebills(fId).then((response) => {
 | 
	
		
			
				|  |  | +        console.log(response)
 | 
	
		
			
				|  |  | +        console.log(response.data.corps)
 | 
	
		
			
				|  |  |          this.form = response.data.warehousebills;
 | 
	
		
			
				|  |  | -        this.$set(this.form, "fCorpid", response.data.warehousebills.fcorpid);
 | 
	
		
			
				|  |  | -        this.$set(
 | 
	
		
			
				|  |  | -          this.form,
 | 
	
		
			
				|  |  | -          "fWarehouseid",
 | 
	
		
			
				|  |  | -          response.data.warehousebills.fwarehouseid
 | 
	
		
			
				|  |  | -        );
 | 
	
		
			
				|  |  | -        this.$set(
 | 
	
		
			
				|  |  | -          this.form,
 | 
	
		
			
				|  |  | -          "fContacts",
 | 
	
		
			
				|  |  | -          response.data.warehousebills.fcontacts
 | 
	
		
			
				|  |  | -        );
 | 
	
		
			
				|  |  | -        this.$set(this.form, "fTel", response.data.warehousebills.ftel);
 | 
	
		
			
				|  |  | -        this.$set(this.form, "fMblno", response.data.warehousebills.fmblno);
 | 
	
		
			
				|  |  | -        this.$set(
 | 
	
		
			
				|  |  | -          this.form,
 | 
	
		
			
				|  |  | -          "fBsdate",
 | 
	
		
			
				|  |  | -          Date.parse(response.data.warehousebills.fbsdate)
 | 
	
		
			
				|  |  | -        );
 | 
	
		
			
				|  |  | -        this.$set(
 | 
	
		
			
				|  |  | -          this.form,
 | 
	
		
			
				|  |  | -          "fStorekeeper",
 | 
	
		
			
				|  |  | -          response.data.warehousebills.fstorekeeper
 | 
	
		
			
				|  |  | -        );
 | 
	
		
			
				|  |  | -        this.$set(this.form, "createBy", response.data.warehousebills.createBy);
 | 
	
		
			
				|  |  | -        this.$set(this.form, "fDeptid", response.data.warehousebills.fdeptid);
 | 
	
		
			
				|  |  | -        this.$set(
 | 
	
		
			
				|  |  | -          this.form,
 | 
	
		
			
				|  |  | -          "fDilldate",
 | 
	
		
			
				|  |  | -          Date.parse(response.data.warehousebills.fbilldate)
 | 
	
		
			
				|  |  | -        );
 | 
	
		
			
				|  |  | -        this.$set(this.form, "fVslvoy", response.data.warehousebills.fvslvoy);
 | 
	
		
			
				|  |  | -        this.$set(
 | 
	
		
			
				|  |  | -          this.form,
 | 
	
		
			
				|  |  | -          "fEta",
 | 
	
		
			
				|  |  | -          Date.parse(response.data.warehousebills.feta)
 | 
	
		
			
				|  |  | -        );
 | 
	
		
			
				|  |  | -        this.$set(
 | 
	
		
			
				|  |  | -          this.form,
 | 
	
		
			
				|  |  | -          "createTime",
 | 
	
		
			
				|  |  | -          Date.parse(response.data.warehousebills.createTime)
 | 
	
		
			
				|  |  | -        );
 | 
	
		
			
				|  |  | -        this.$set(
 | 
	
		
			
				|  |  | -          this.form,
 | 
	
		
			
				|  |  | -          "fTrademodeid",
 | 
	
		
			
				|  |  | -          response.data.warehousebills.ftrademodeid + ""
 | 
	
		
			
				|  |  | -        );
 | 
	
		
			
				|  |  | -        this.$set(
 | 
	
		
			
				|  |  | -          this.form,
 | 
	
		
			
				|  |  | -          "fBillingway",
 | 
	
		
			
				|  |  | -          response.data.warehousebills.fbillingway + ""
 | 
	
		
			
				|  |  | -        );
 | 
	
		
			
				|  |  | -        this.$set(
 | 
	
		
			
				|  |  | -          this.form,
 | 
	
		
			
				|  |  | -          "fFeetunit",
 | 
	
		
			
				|  |  | -          response.data.warehousebills.ffeetunit + ""
 | 
	
		
			
				|  |  | -        );
 | 
	
		
			
				|  |  | -        this.$set(
 | 
	
		
			
				|  |  | -          this.form,
 | 
	
		
			
				|  |  | -          "fBscorpno",
 | 
	
		
			
				|  |  | -          response.data.warehousebills.fbscorpno
 | 
	
		
			
				|  |  | -        );
 | 
	
		
			
				|  |  | -        this.$set(
 | 
	
		
			
				|  |  | -          this.form,
 | 
	
		
			
				|  |  | -          "fCustomno",
 | 
	
		
			
				|  |  | -          response.data.warehousebills.fcustomno
 | 
	
		
			
				|  |  | -        );
 | 
	
		
			
				|  |  | -        this.$set(
 | 
	
		
			
				|  |  | -          this.form,
 | 
	
		
			
				|  |  | -          "fStltypeid",
 | 
	
		
			
				|  |  | -          response.data.warehousebills.fstltypeid + ""
 | 
	
		
			
				|  |  | -        );
 | 
	
		
			
				|  |  | -        this.$set(
 | 
	
		
			
				|  |  | -          this.form,
 | 
	
		
			
				|  |  | -          "fIfweigh",
 | 
	
		
			
				|  |  | -          response.data.warehousebills.fifweigh + ""
 | 
	
		
			
				|  |  | -        );
 | 
	
		
			
				|  |  | -        this.$set(
 | 
	
		
			
				|  |  | -          this.form,
 | 
	
		
			
				|  |  | -          "fIfdamage",
 | 
	
		
			
				|  |  | -          response.data.warehousebills.fifdamage + ""
 | 
	
		
			
				|  |  | -        );
 | 
	
		
			
				|  |  | -        this.$set(this.form, "fSbu", response.data.warehousebills.fsbu);
 | 
	
		
			
				|  |  | -        this.$set(
 | 
	
		
			
				|  |  | -          this.form,
 | 
	
		
			
				|  |  | -          "fIfpledge",
 | 
	
		
			
				|  |  | -          response.data.warehousebills.fifpledge + ""
 | 
	
		
			
				|  |  | -        );
 | 
	
		
			
				|  |  | -        this.$set(
 | 
	
		
			
				|  |  | -          this.form,
 | 
	
		
			
				|  |  | -          "fBankcorpid",
 | 
	
		
			
				|  |  | -          response.data.warehousebills.fbankcorpid
 | 
	
		
			
				|  |  | -        );
 | 
	
		
			
				|  |  | -        this.$set(this.form, "remark", response.data.warehousebills.remark);
 | 
	
		
			
				|  |  | -        this.deptOptions = [];
 | 
	
		
			
				|  |  | -        this.deptOptions.push(response.data.dept);
 | 
	
		
			
				|  |  | -        this.fMblnoOptions = [];
 | 
	
		
			
				|  |  | -        this.fMblnoOptions.push(response.data.fCorps);
 | 
	
		
			
				|  |  | -        if (response.data.fSbu !== null) {
 | 
	
		
			
				|  |  | -          this.fSbuOptions = [];
 | 
	
		
			
				|  |  | -          this.fSbuOptions.push(response.data.fSbu);
 | 
	
		
			
				|  |  | -        }
 | 
	
		
			
				|  |  | -        if (response.data.warehouse !== null) {
 | 
	
		
			
				|  |  | -          this.warehouseOptions = [];
 | 
	
		
			
				|  |  | -          this.warehouseOptions.push(response.data.warehouse);
 | 
	
		
			
				|  |  | -        }
 | 
	
		
			
				|  |  | -        if (
 | 
	
		
			
				|  |  | -          typeof response.data.warehouseBillsItem !== "undefined" &&
 | 
	
		
			
				|  |  | -          response.data.warehouseBillsItem !== null
 | 
	
		
			
				|  |  | -        ) {
 | 
	
		
			
				|  |  | -          this.dataList = response.data.warehouseBillsItem;
 | 
	
		
			
				|  |  | -          if (response.data.goodsList !== null) {
 | 
	
		
			
				|  |  | -            this.goodsOptions = [];
 | 
	
		
			
				|  |  | -            this.goodsOptions = response.data.goodsList;
 | 
	
		
			
				|  |  | -          }
 | 
	
		
			
				|  |  | -        }
 | 
	
		
			
				|  |  | +        this.fMblnoOptions = []
 | 
	
		
			
				|  |  | +        this.fMblnoOptions = response.data.corps;
 | 
	
		
			
				|  |  | +        this.dataList = response.data.goodsList;
 | 
	
		
			
				|  |  | +        this.relevantAttachments = response.data.enclosures;
 | 
	
		
			
				|  |  | +        this.warehouseDrList = response.data.warehousebillsfeesDr;
 | 
	
		
			
				|  |  | +        this.warehouseCrList = response.data.warehousebillsfeesCr;
 | 
	
		
			
				|  |  | +        // this.$set(this.form, "fCorpid", response.data.corps[0].fName);
 | 
	
		
			
				|  |  | +        // this.$set(this.form, "fStltypeid", response.data.corps[0].fName);
 | 
	
		
			
				|  |  | +        // console.log(this.form)
 | 
	
		
			
				|  |  | +        // this.$set(this.form, "fCorpid", response.data.warehousebills.fcorpid);
 | 
	
		
			
				|  |  | +        // this.$set(
 | 
	
		
			
				|  |  | +        //   this.form,
 | 
	
		
			
				|  |  | +        //   "fWarehouseid",
 | 
	
		
			
				|  |  | +        //   response.data.warehousebills.fwarehouseid
 | 
	
		
			
				|  |  | +        // );
 | 
	
		
			
				|  |  | +        // this.$set(
 | 
	
		
			
				|  |  | +        //   this.form,
 | 
	
		
			
				|  |  | +        //   "fContacts",
 | 
	
		
			
				|  |  | +        //   response.data.warehousebills.fcontacts
 | 
	
		
			
				|  |  | +        // );
 | 
	
		
			
				|  |  | +        // this.$set(this.form, "fTel", response.data.warehousebills.ftel);
 | 
	
		
			
				|  |  | +        // this.$set(this.form, "fMblno", response.data.warehousebills.fmblno);
 | 
	
		
			
				|  |  | +        // this.$set(
 | 
	
		
			
				|  |  | +        //   this.form,
 | 
	
		
			
				|  |  | +        //   "fBsdate",
 | 
	
		
			
				|  |  | +        //   Date.parse(response.data.warehousebills.fbsdate)
 | 
	
		
			
				|  |  | +        // );
 | 
	
		
			
				|  |  | +        // this.$set(
 | 
	
		
			
				|  |  | +        //   this.form,
 | 
	
		
			
				|  |  | +        //   "fStorekeeper",
 | 
	
		
			
				|  |  | +        //   response.data.warehousebills.fstorekeeper
 | 
	
		
			
				|  |  | +        // );
 | 
	
		
			
				|  |  | +        // this.$set(this.form, "createBy", response.data.warehousebills.createBy);
 | 
	
		
			
				|  |  | +        // this.$set(this.form, "fDeptid", response.data.warehousebills.fdeptid);
 | 
	
		
			
				|  |  | +        // this.$set(
 | 
	
		
			
				|  |  | +        //   this.form,
 | 
	
		
			
				|  |  | +        //   "fDilldate",
 | 
	
		
			
				|  |  | +        //   Date.parse(response.data.warehousebills.fbilldate)
 | 
	
		
			
				|  |  | +        // );
 | 
	
		
			
				|  |  | +        // this.$set(this.form, "fVslvoy", response.data.warehousebills.fvslvoy);
 | 
	
		
			
				|  |  | +        // this.$set(
 | 
	
		
			
				|  |  | +        //   this.form,
 | 
	
		
			
				|  |  | +        //   "fEta",
 | 
	
		
			
				|  |  | +        //   Date.parse(response.data.warehousebills.feta)
 | 
	
		
			
				|  |  | +        // );
 | 
	
		
			
				|  |  | +        // this.$set(
 | 
	
		
			
				|  |  | +        //   this.form,
 | 
	
		
			
				|  |  | +        //   "createTime",
 | 
	
		
			
				|  |  | +        //   Date.parse(response.data.warehousebills.createTime)
 | 
	
		
			
				|  |  | +        // );
 | 
	
		
			
				|  |  | +        // this.$set(
 | 
	
		
			
				|  |  | +        //   this.form,
 | 
	
		
			
				|  |  | +        //   "fTrademodeid",
 | 
	
		
			
				|  |  | +        //   response.data.warehousebills.ftrademodeid + ""
 | 
	
		
			
				|  |  | +        // );
 | 
	
		
			
				|  |  | +        // this.$set(
 | 
	
		
			
				|  |  | +        //   this.form,
 | 
	
		
			
				|  |  | +        //   "fBillingway",
 | 
	
		
			
				|  |  | +        //   response.data.warehousebills.fbillingway + ""
 | 
	
		
			
				|  |  | +        // );
 | 
	
		
			
				|  |  | +        // this.$set(
 | 
	
		
			
				|  |  | +        //   this.form,
 | 
	
		
			
				|  |  | +        //   "fFeetunit",
 | 
	
		
			
				|  |  | +        //   response.data.warehousebills.ffeetunit + ""
 | 
	
		
			
				|  |  | +        // );
 | 
	
		
			
				|  |  | +        // this.$set(
 | 
	
		
			
				|  |  | +        //   this.form,
 | 
	
		
			
				|  |  | +        //   "fBscorpno",
 | 
	
		
			
				|  |  | +        //   response.data.warehousebills.fbscorpno
 | 
	
		
			
				|  |  | +        // );
 | 
	
		
			
				|  |  | +        // this.$set(
 | 
	
		
			
				|  |  | +        //   this.form,
 | 
	
		
			
				|  |  | +        //   "fCustomno",
 | 
	
		
			
				|  |  | +        //   response.data.warehousebills.fcustomno
 | 
	
		
			
				|  |  | +        // );
 | 
	
		
			
				|  |  | +        // this.$set(
 | 
	
		
			
				|  |  | +        //   this.form,
 | 
	
		
			
				|  |  | +        //   "fStltypeid",
 | 
	
		
			
				|  |  | +        //   response.data.warehousebills.fstltypeid + ""
 | 
	
		
			
				|  |  | +        // );
 | 
	
		
			
				|  |  | +        // this.$set(
 | 
	
		
			
				|  |  | +        //   this.form,
 | 
	
		
			
				|  |  | +        //   "fIfweigh",
 | 
	
		
			
				|  |  | +        //   response.data.warehousebills.fifweigh + ""
 | 
	
		
			
				|  |  | +        // );
 | 
	
		
			
				|  |  | +        // this.$set(
 | 
	
		
			
				|  |  | +        //   this.form,
 | 
	
		
			
				|  |  | +        //   "fIfdamage",
 | 
	
		
			
				|  |  | +        //   response.data.warehousebills.fifdamage + ""
 | 
	
		
			
				|  |  | +        // );
 | 
	
		
			
				|  |  | +        // this.$set(this.form, "fSbu", response.data.warehousebills.fsbu);
 | 
	
		
			
				|  |  | +        // this.$set(
 | 
	
		
			
				|  |  | +        //   this.form,
 | 
	
		
			
				|  |  | +        //   "fIfpledge",
 | 
	
		
			
				|  |  | +        //   response.data.warehousebills.fifpledge + ""
 | 
	
		
			
				|  |  | +        // );
 | 
	
		
			
				|  |  | +        // this.$set(
 | 
	
		
			
				|  |  | +        //   this.form,
 | 
	
		
			
				|  |  | +        //   "fBankcorpid",
 | 
	
		
			
				|  |  | +        //   response.data.warehousebills.fbankcorpid
 | 
	
		
			
				|  |  | +        // );
 | 
	
		
			
				|  |  | +        // this.$set(this.form, "remark", response.data.warehousebills.remark);
 | 
	
		
			
				|  |  | +        // this.deptOptions = [];
 | 
	
		
			
				|  |  | +        // this.deptOptions.push(response.data.dept);
 | 
	
		
			
				|  |  | +        // this.fMblnoOptions = [];
 | 
	
		
			
				|  |  | +        // this.fMblnoOptions.push(response.data.fCorps);
 | 
	
		
			
				|  |  | +        // if (response.data.fSbu !== null) {
 | 
	
		
			
				|  |  | +        //   this.fSbuOptions = [];
 | 
	
		
			
				|  |  | +        //   this.fSbuOptions.push(response.data.fSbu);
 | 
	
		
			
				|  |  | +        // }
 | 
	
		
			
				|  |  | +        // if (response.data.warehouse !== null) {
 | 
	
		
			
				|  |  | +        //   this.warehouseOptions = [];
 | 
	
		
			
				|  |  | +        //   this.warehouseOptions.push(response.data.warehouse);
 | 
	
		
			
				|  |  | +        // }
 | 
	
		
			
				|  |  | +        // if (
 | 
	
		
			
				|  |  | +        //   typeof response.data.warehouseBillsItem !== "undefined" &&
 | 
	
		
			
				|  |  | +        //   response.data.warehouseBillsItem !== null
 | 
	
		
			
				|  |  | +        // ) {
 | 
	
		
			
				|  |  | +        //   this.dataList = response.data.warehouseBillsItem;
 | 
	
		
			
				|  |  | +        //   if (response.data.goodsList !== null) {
 | 
	
		
			
				|  |  | +        //     this.goodsOptions = [];
 | 
	
		
			
				|  |  | +        //     this.goodsOptions = response.data.goodsList;
 | 
	
		
			
				|  |  | +        //   }
 | 
	
		
			
				|  |  | +        // }
 | 
	
		
			
				|  |  |          this.open = true;
 | 
	
		
			
				|  |  |          this.title = "修改仓库主(出入库)";
 | 
	
		
			
				|  |  |        });
 | 
	
	
		
			
				|  | @@ -2358,11 +2379,6 @@ export default {
 | 
	
		
			
				|  |  |          this.form.fBillstatus = 6;
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  |        this.$refs["form"].validate((valid) => {
 | 
	
		
			
				|  |  | -        console.log(valid);
 | 
	
		
			
				|  |  | -        console.log(this.form);
 | 
	
		
			
				|  |  | -        console.log(this.warehouseCrList);
 | 
	
		
			
				|  |  | -        console.log(this.warehouseDrList);
 | 
	
		
			
				|  |  | -        console.log(this.dataList);
 | 
	
		
			
				|  |  |          if (valid) {
 | 
	
		
			
				|  |  |            let formData = new window.FormData();
 | 
	
		
			
				|  |  |            // 附件数据
 | 
	
	
		
			
				|  | @@ -2479,8 +2495,20 @@ export default {
 | 
	
		
			
				|  |  |        if (name == null || name === "") {
 | 
	
		
			
				|  |  |          return false;
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  | -      let queryParams = { pageNum: 1, pageSize: 10, fName: name };
 | 
	
		
			
				|  |  | +      let queryParams = { pageNum: 1, pageSize: 10, fName: name};
 | 
	
		
			
				|  |  |        listWarehouse(queryParams).then((response) => {
 | 
	
		
			
				|  |  | +        console.log(response)
 | 
	
		
			
				|  |  | +        this.warehouseOptions = response.rows;
 | 
	
		
			
				|  |  | +      });
 | 
	
		
			
				|  |  | +    },
 | 
	
		
			
				|  |  | +    /* 远程模糊查询库区 */
 | 
	
		
			
				|  |  | +    warehouseRemoteMethod(name) {
 | 
	
		
			
				|  |  | +      if (name == null || name === "") {
 | 
	
		
			
				|  |  | +        return false;
 | 
	
		
			
				|  |  | +      }
 | 
	
		
			
				|  |  | +      let queryParams = { pageNum: 1, pageSize: 10, fName: name};
 | 
	
		
			
				|  |  | +      listWarehouse(queryParams).then((response) => {
 | 
	
		
			
				|  |  | +        console.log(response)
 | 
	
		
			
				|  |  |          this.warehouseOptions = response.rows;
 | 
	
		
			
				|  |  |        });
 | 
	
		
			
				|  |  |      },
 |