|  | @@ -640,12 +640,6 @@
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |            <el-col :span="8">
 | 
	
		
			
				|  |  |              <el-form-item label="劳务公司" prop="fLabour">
 | 
	
		
			
				|  |  | -              <!--              <el-autocomplete-->
 | 
	
		
			
				|  |  | -              <!--                v-model="form.fLabour"-->
 | 
	
		
			
				|  |  | -              <!--                :fetch-suggestions="fMblnoOptions"-->
 | 
	
		
			
				|  |  | -              <!--                placeholder="请输入内容"-->
 | 
	
		
			
				|  |  | -              <!--                @select="flabourRemoteMethod"-->
 | 
	
		
			
				|  |  | -              <!--              ></el-autocomplete>-->
 | 
	
		
			
				|  |  |                <el-select
 | 
	
		
			
				|  |  |                  style="width: 80%"
 | 
	
		
			
				|  |  |                  v-model="form.fLabour"
 | 
	
	
		
			
				|  | @@ -655,7 +649,7 @@
 | 
	
		
			
				|  |  |                  :disabled="contrOl"
 | 
	
		
			
				|  |  |                  placeholder="请输入劳务公司">
 | 
	
		
			
				|  |  |                  <el-option
 | 
	
		
			
				|  |  | -                  v-for="(dict, index) in fSbuOptIons"
 | 
	
		
			
				|  |  | +                  v-for="(dict, index) in fCompanyOptIons"
 | 
	
		
			
				|  |  |                    :key="index.fId"
 | 
	
		
			
				|  |  |                    :label="dict.fName"
 | 
	
		
			
				|  |  |                    :value="dict.fId"
 | 
	
	
		
			
				|  | @@ -3108,7 +3102,6 @@ export default {
 | 
	
		
			
				|  |  |        // 库存明细撤回入账数组
 | 
	
		
			
				|  |  |        dataWithdrawList: [],
 | 
	
		
			
				|  |  |        fSbuOptions: [],
 | 
	
		
			
				|  |  | -      fSbuOptIons: [],
 | 
	
		
			
				|  |  |        fleetOptions:[],
 | 
	
		
			
				|  |  |        // 操作员
 | 
	
		
			
				|  |  |        userOptions: [],
 | 
	
	
		
			
				|  | @@ -3141,6 +3134,8 @@ export default {
 | 
	
		
			
				|  |  |        fBillstatusOptions: [],
 | 
	
		
			
				|  |  |        //结算方式对应字典表
 | 
	
		
			
				|  |  |        fStltypeidOptions:[],
 | 
	
		
			
				|  |  | +      // 劳务公司
 | 
	
		
			
				|  |  | +      fCompanyOptIons: [],
 | 
	
		
			
				|  |  |        // 费用名称
 | 
	
		
			
				|  |  |        fWbuOptions: [],
 | 
	
		
			
				|  |  |        // 计价单位
 | 
	
	
		
			
				|  | @@ -3307,7 +3302,7 @@ export default {
 | 
	
		
			
				|  |  |        this.fStltypeidOptions = response.data;
 | 
	
		
			
				|  |  |      });
 | 
	
		
			
				|  |  |      this.getDicts("data_customer_category").then(response => {
 | 
	
		
			
				|  |  | -      this.fSbuOptions = response.data;
 | 
	
		
			
				|  |  | +      this.fCompanyOptIons = response.data;
 | 
	
		
			
				|  |  |      });
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |    },
 | 
	
	
		
			
				|  | @@ -3390,7 +3385,7 @@ export default {
 | 
	
		
			
				|  |  |            if (response.data.corps) {
 | 
	
		
			
				|  |  |              this.fMblnoOptions = response.data.corps;
 | 
	
		
			
				|  |  |              this.KHblnoOptions = response.data.corps;
 | 
	
		
			
				|  |  | -            this.fSbuOptIons = response.data.corps;
 | 
	
		
			
				|  |  | +            this.fCompanyOptIons = response.data.corps;
 | 
	
		
			
				|  |  |            }
 | 
	
		
			
				|  |  |            if (response.data.feesList) {
 | 
	
		
			
				|  |  |              this.fWbuOptions = response.data.feesList;
 | 
	
	
		
			
				|  | @@ -3845,8 +3840,7 @@ export default {
 | 
	
		
			
				|  |  |      getList() {
 | 
	
		
			
				|  |  |        let queryParams = { pageNum: 1, pageSize: 10, fTypeid: 6}
 | 
	
		
			
				|  |  |        listCorps(queryParams).then((response) => {
 | 
	
		
			
				|  |  | -        this.fSbuOptIons = response.rows;
 | 
	
		
			
				|  |  | -        console.log(this.fSbuOptIons)
 | 
	
		
			
				|  |  | +        this.fCompanyOptIons = response.rows;
 | 
	
		
			
				|  |  |        });
 | 
	
		
			
				|  |  |        let params = { pageNum: 1, pageSize: 10, fTypeid: 2}
 | 
	
		
			
				|  |  |        listCorps(params).then((response) => {
 | 
	
	
		
			
				|  | @@ -4221,7 +4215,6 @@ export default {
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  |      /** 新增按钮操作 */
 | 
	
		
			
				|  |  |      handleAdd(status) {
 | 
	
		
			
				|  |  | -      this.changefLourd()
 | 
	
		
			
				|  |  |        this.reset()
 | 
	
		
			
				|  |  |        this.form = {
 | 
	
		
			
				|  |  |          fItemsStatus: null,
 | 
	
	
		
			
				|  | @@ -4244,23 +4237,16 @@ export default {
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  |      /** 修改按钮操作 */
 | 
	
		
			
				|  |  |      handleUpdate(row, status) {
 | 
	
		
			
				|  |  | -      console.log(this.dataList)
 | 
	
		
			
				|  |  |        this.dataList = []
 | 
	
		
			
				|  |  |        this.reset()
 | 
	
		
			
				|  |  | -      // this.contrOl = true
 | 
	
		
			
				|  |  | -      // if (this.dataList.length === 0){
 | 
	
		
			
				|  |  | -      //
 | 
	
		
			
				|  |  | -      // }
 | 
	
		
			
				|  |  |        this.browseStatus = status;
 | 
	
		
			
				|  |  |        this.contrOl = status;
 | 
	
		
			
				|  |  |        this.detailsHidden = false;
 | 
	
		
			
				|  |  |        this.formBrowseStatus = false;
 | 
	
		
			
				|  |  |        const fId = row.fId || this.ids;
 | 
	
		
			
				|  |  |        this.dataList = [];
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  |        this.goodsRemoteMethod()
 | 
	
		
			
				|  |  |        getWarehousebills(fId).then((response) => {
 | 
	
		
			
				|  |  | -        console.log(response)
 | 
	
		
			
				|  |  |          if (response.data.warehousebills) {
 | 
	
		
			
				|  |  |            this.form = response.data.warehousebills;
 | 
	
		
			
				|  |  |            this.before = this.form.createBy
 | 
	
	
		
			
				|  | @@ -4269,6 +4255,14 @@ export default {
 | 
	
		
			
				|  |  |            } else {
 | 
	
		
			
				|  |  |              this.fMblno = true;
 | 
	
		
			
				|  |  |            }
 | 
	
		
			
				|  |  | +          this.$set(this.form, "fEta", Date.parse(this.form.fEta));
 | 
	
		
			
				|  |  | +          this.$set(this.form, "fStltypeid", this.form.fStltypeid + "");
 | 
	
		
			
				|  |  | +          this.$set(this.form, "fBsdate", Date.parse(this.form.fBsdate));
 | 
	
		
			
				|  |  | +          this.$set(this.form, "fTrademodeid", this.form.fTrademodeid + "");
 | 
	
		
			
				|  |  | +          this.$set(this.form, "createTime", Date.parse(this.form.createTime));
 | 
	
		
			
				|  |  | +          this.$set(this.form, "fFeeUnitid", this.form.fFeeunitid + "");
 | 
	
		
			
				|  |  | +          this.$set(this.form, "fPlannetweight", this.form.fPlannetweight.toFixed(2));
 | 
	
		
			
				|  |  | +          this.$set(this.form, "fPlangrossweight", this.form.fPlangrossweight.toFixed(2));
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  |          if (response.data.warehouseBillsItem) {
 | 
	
		
			
				|  |  |            this.dataList = response.data.warehouseBillsItem;
 | 
	
	
		
			
				|  | @@ -4286,7 +4280,8 @@ export default {
 | 
	
		
			
				|  |  |          if (response.data.corps) {
 | 
	
		
			
				|  |  |            this.fMblnoOptions = response.data.corps;
 | 
	
		
			
				|  |  |            this.KHblnoOptions = response.data.corps;
 | 
	
		
			
				|  |  | -          this.fSbuOptions = response.data.corps;
 | 
	
		
			
				|  |  | +          this.fCompanyOptIons = response.data.corps;
 | 
	
		
			
				|  |  | +          this.fleetOptions = response.data.corps;
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  |          if (response.data.feesList) {
 | 
	
		
			
				|  |  |            this.fWbuOptions = response.data.feesList;
 | 
	
	
		
			
				|  | @@ -4305,14 +4300,6 @@ export default {
 | 
	
		
			
				|  |  |          if (response.data.enclosures) {
 | 
	
		
			
				|  |  |            this.relevantAttachments = response.data.enclosures;
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  | -        this.$set(this.form, "fEta", Date.parse(this.form.fEta));
 | 
	
		
			
				|  |  | -        this.$set(this.form, "fStltypeid", this.form.fStltypeid + "");
 | 
	
		
			
				|  |  | -        this.$set(this.form, "fBsdate", Date.parse(this.form.fBsdate));
 | 
	
		
			
				|  |  | -        this.$set(this.form, "fTrademodeid", this.form.fTrademodeid + "");
 | 
	
		
			
				|  |  | -        this.$set(this.form, "createTime", Date.parse(this.form.createTime));
 | 
	
		
			
				|  |  | -        this.$set(this.form, "fFeeUnitid", this.form.fFeeunitid + "");
 | 
	
		
			
				|  |  | -        this.$set(this.form, "fPlannetweight", this.form.fPlannetweight.toFixed(2));
 | 
	
		
			
				|  |  | -        this.$set(this.form, "fPlangrossweight", this.form.fPlangrossweight.toFixed(2));
 | 
	
		
			
				|  |  |          for (let list in this.dataList) {
 | 
	
		
			
				|  |  |            this.$set(this.dataList[list], "fBsdate", Date.parse(this.dataList[list].fBsdate));
 | 
	
		
			
				|  |  |          }
 | 
	
	
		
			
				|  | @@ -4334,8 +4321,6 @@ export default {
 | 
	
		
			
				|  |  |        queryUserVal().then((response)=>{
 | 
	
		
			
				|  |  |          this.current = response.user.userName
 | 
	
		
			
				|  |  |        })
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  | -      console.log(this.dataList)
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  |      // 库存总账多选框
 | 
	
		
			
				|  |  |      whgenlegSelectionChange(selection) {
 | 
	
	
		
			
				|  | @@ -5004,8 +4989,7 @@ export default {
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  |        let queryParams = { pageNum: 1, pageSize: 10, fName: name, fTypeid: 6};
 | 
	
		
			
				|  |  |        listCorps(queryParams).then((response) => {
 | 
	
		
			
				|  |  | -        console.log(response)
 | 
	
		
			
				|  |  | -        this.fSbuOptions = response.rows;
 | 
	
		
			
				|  |  | +        this.fCompanyOptIons = response.rows;
 | 
	
		
			
				|  |  |        });
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  |      /* 远程模糊查询车队 */
 |