|  | @@ -252,8 +252,8 @@
 | 
	
		
			
				|  |  |        <el-table-column label="仓库" align="center" prop="fWarehouseid" />
 | 
	
		
			
				|  |  |        <el-table-column label="计划件数" align="center" prop="fPlanqty" />
 | 
	
		
			
				|  |  |        <el-table-column label="出库件数" align="center" prop="fQty" />
 | 
	
		
			
				|  |  | -      <el-table-column label="出库毛重" align="center" prop="fGrossweight" />
 | 
	
		
			
				|  |  | -      <el-table-column label="出库净重" align="center" prop="fNetweight" />
 | 
	
		
			
				|  |  | +      <el-table-column label="出库毛重(kg)" align="center" prop="fGrossweight" />
 | 
	
		
			
				|  |  | +      <el-table-column label="出库净重(kg)" align="center" prop="fNetweight" />
 | 
	
		
			
				|  |  |        <el-table-column label="车号" align="center" prop="fTruckno" width="100"/>
 | 
	
		
			
				|  |  |        <el-table-column label="司机" align="center" prop="fDriverName" />
 | 
	
		
			
				|  |  |        <el-table-column label="司机电话" align="center" prop="fDriverTel" width="120" show-overflow-tooltip/>
 | 
	
	
		
			
				|  | @@ -481,7 +481,7 @@
 | 
	
		
			
				|  |  |              </el-form-item>
 | 
	
		
			
				|  |  |            </el-col>
 | 
	
		
			
				|  |  |            <el-col :span="8">
 | 
	
		
			
				|  |  | -            <el-form-item label="计划净重" prop="fPlannetweight">
 | 
	
		
			
				|  |  | +            <el-form-item label="计划净重(kg)" prop="fPlannetweight">
 | 
	
		
			
				|  |  |                <el-input
 | 
	
		
			
				|  |  |                  v-model="form.fPlannetweight"
 | 
	
		
			
				|  |  |                  style="width: 80%"
 | 
	
	
		
			
				|  | @@ -493,7 +493,7 @@
 | 
	
		
			
				|  |  |              </el-form-item>
 | 
	
		
			
				|  |  |            </el-col>
 | 
	
		
			
				|  |  |            <el-col :span="8">
 | 
	
		
			
				|  |  | -            <el-form-item label="计划毛重" prop="fPlangrossweight">
 | 
	
		
			
				|  |  | +            <el-form-item label="计划毛重(kg)" prop="fPlangrossweight">
 | 
	
		
			
				|  |  |                <el-input
 | 
	
		
			
				|  |  |                  v-model="form.fPlangrossweight"
 | 
	
		
			
				|  |  |                  oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
 | 
	
	
		
			
				|  | @@ -996,7 +996,7 @@
 | 
	
		
			
				|  |  |                header-align="center"
 | 
	
		
			
				|  |  |                align="center"
 | 
	
		
			
				|  |  |                width="180px"
 | 
	
		
			
				|  |  | -              label="*结余毛重"
 | 
	
		
			
				|  |  | +              label="*结余毛重(kg)"
 | 
	
		
			
				|  |  |              >
 | 
	
		
			
				|  |  |              </el-table-column>
 | 
	
		
			
				|  |  |              <el-table-column
 | 
	
	
		
			
				|  | @@ -1004,7 +1004,7 @@
 | 
	
		
			
				|  |  |                header-align="center"
 | 
	
		
			
				|  |  |                align="center"
 | 
	
		
			
				|  |  |                width="180px"
 | 
	
		
			
				|  |  | -              label="*结余净重"
 | 
	
		
			
				|  |  | +              label="*结余净重(kg)"
 | 
	
		
			
				|  |  |              >
 | 
	
		
			
				|  |  |              </el-table-column>
 | 
	
		
			
				|  |  |              <el-table-column
 | 
	
	
		
			
				|  | @@ -1030,7 +1030,7 @@
 | 
	
		
			
				|  |  |                header-align="center"
 | 
	
		
			
				|  |  |                width="180px"
 | 
	
		
			
				|  |  |                align="center"
 | 
	
		
			
				|  |  | -              label="*出库毛重"
 | 
	
		
			
				|  |  | +              label="*出库毛重(kg)"
 | 
	
		
			
				|  |  |              >
 | 
	
		
			
				|  |  |                <template slot-scope="scope">
 | 
	
		
			
				|  |  |                  <el-input
 | 
	
	
		
			
				|  | @@ -1048,7 +1048,7 @@
 | 
	
		
			
				|  |  |                header-align="center"
 | 
	
		
			
				|  |  |                width="180px"
 | 
	
		
			
				|  |  |                align="center"
 | 
	
		
			
				|  |  | -              label="*出库净重"
 | 
	
		
			
				|  |  | +              label="*出库净重(kg)"
 | 
	
		
			
				|  |  |              >
 | 
	
		
			
				|  |  |                <template slot-scope="scope">
 | 
	
		
			
				|  |  |                  <el-input
 | 
	
	
		
			
				|  | @@ -2614,7 +2614,7 @@
 | 
	
		
			
				|  |  |              <td width="200">货物品名</td>
 | 
	
		
			
				|  |  |              <td width="200">提单号</td>
 | 
	
		
			
				|  |  |              <td width="200">品牌/规格/产地</td>
 | 
	
		
			
				|  |  | -            <td width="200">净重(吨)</td>
 | 
	
		
			
				|  |  | +            <td width="200">净重(kg)</td>
 | 
	
		
			
				|  |  |              <td width="200">件数(50KG)</td>
 | 
	
		
			
				|  |  |            </tr>
 | 
	
		
			
				|  |  |            <tr v-for="(item, index) in printinglist" :key="index">
 | 
	
	
		
			
				|  | @@ -3001,6 +3001,159 @@ export default {
 | 
	
		
			
				|  |  |        },
 | 
	
		
			
				|  |  |      };
 | 
	
		
			
				|  |  |    },
 | 
	
		
			
				|  |  | +  bind(el, binding, vnode, oldVnode) {
 | 
	
		
			
				|  |  | +    //弹框可拉伸最小宽高
 | 
	
		
			
				|  |  | +    let minWidth = 400;
 | 
	
		
			
				|  |  | +    let minHeight = 300;
 | 
	
		
			
				|  |  | +    //初始非全屏
 | 
	
		
			
				|  |  | +    let isFullScreen = false;
 | 
	
		
			
				|  |  | +    //当前宽高
 | 
	
		
			
				|  |  | +    let nowWidth = 0;
 | 
	
		
			
				|  |  | +    let nowHight = 0;
 | 
	
		
			
				|  |  | +    //当前顶部高度
 | 
	
		
			
				|  |  | +    let nowMarginTop = 0;
 | 
	
		
			
				|  |  | +    //获取弹框头部(这部分可双击全屏)
 | 
	
		
			
				|  |  | +    const dialogHeaderEl = el.querySelector('.el-dialog__header');
 | 
	
		
			
				|  |  | +    let hasSetBodyHight = false;
 | 
	
		
			
				|  |  | +    //弹窗
 | 
	
		
			
				|  |  | +    const dragDom = el.querySelector('.el-dialog');
 | 
	
		
			
				|  |  | +    //给弹窗加上overflow auto;不然缩小时框内的标签可能超出dialog;
 | 
	
		
			
				|  |  | +    // dragDom.style.overflow = "auto";
 | 
	
		
			
				|  |  | +    //清除选择头部文字效果
 | 
	
		
			
				|  |  | +    dialogHeaderEl.onselectstart = new Function("return false");
 | 
	
		
			
				|  |  | +    //头部加上可拖动cursor
 | 
	
		
			
				|  |  | +    dialogHeaderEl.style.cursor = 'move';
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +    // 获取原有属性 ie dom元素.currentStyle 火狐谷歌 window.getComputedStyle(dom元素, null);
 | 
	
		
			
				|  |  | +    const sty = dragDom.currentStyle || window.getComputedStyle(dragDom, null);
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +    //头部插入最大化最小化元素
 | 
	
		
			
				|  |  | +    let maxMin = document.createElement("button");
 | 
	
		
			
				|  |  | +    maxMin.className +=' el-dialog__headerbtn el-dialog__minmax';
 | 
	
		
			
				|  |  | +    maxMin.style.right = '40px';
 | 
	
		
			
				|  |  | +    maxMin.style.color = '#909399';
 | 
	
		
			
				|  |  | +    maxMin.title='最大化';
 | 
	
		
			
				|  |  | +    maxMin.innerHTML = '<i class="el-icon-full-screen" onMouseOver="this.style.color=\'#409EFF\'" onMouseOut="this.style.color=\'inherit\'"></i>';
 | 
	
		
			
				|  |  | +    dialogHeaderEl.insertBefore(maxMin,dialogHeaderEl.childNodes[1]);
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +    let moveDown = (e) => {
 | 
	
		
			
				|  |  | +      // 鼠标按下,计算当前元素距离可视区的距离
 | 
	
		
			
				|  |  | +      const disX = e.clientX - dialogHeaderEl.offsetLeft;
 | 
	
		
			
				|  |  | +      const disY = e.clientY - dialogHeaderEl.offsetTop;
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +      // 获取到的值带px 正则匹配替换
 | 
	
		
			
				|  |  | +      let styL, styT;
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +      // 注意在ie中 第一次获取到的值为组件自带50% 移动之后赋值为px
 | 
	
		
			
				|  |  | +      if (sty.left.includes('%')) {
 | 
	
		
			
				|  |  | +        styL = +document.body.clientWidth * (+sty.left.replace(/\%/g, '') / 100);
 | 
	
		
			
				|  |  | +        styT = +document.body.clientHeight * (+sty.top.replace(/\%/g, '') / 100);
 | 
	
		
			
				|  |  | +      } else {
 | 
	
		
			
				|  |  | +        styL = +sty.left.replace(/\px/g, '');
 | 
	
		
			
				|  |  | +        styT = +sty.top.replace(/\px/g, '');
 | 
	
		
			
				|  |  | +      };
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +      document.onmousemove = function (e) {
 | 
	
		
			
				|  |  | +        // 通过事件委托,计算移动的距离
 | 
	
		
			
				|  |  | +        const l = e.clientX - disX;
 | 
	
		
			
				|  |  | +        const t = e.clientY - disY;
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +        // 移动当前元素
 | 
	
		
			
				|  |  | +        dragDom.style.left = `${l + styL}px`;
 | 
	
		
			
				|  |  | +        dragDom.style.top = `${t + styT}px`;
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +        //将此时的位置传出去
 | 
	
		
			
				|  |  | +        //binding.value({x:e.pageX,y:e.pageY})
 | 
	
		
			
				|  |  | +      };
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +      document.onmouseup = function (e) {
 | 
	
		
			
				|  |  | +        document.onmousemove = null;
 | 
	
		
			
				|  |  | +        document.onmouseup = null;
 | 
	
		
			
				|  |  | +      };
 | 
	
		
			
				|  |  | +    }
 | 
	
		
			
				|  |  | +    dialogHeaderEl.onmousedown = moveDown;
 | 
	
		
			
				|  |  | +    let bodyHeight = 'auto';
 | 
	
		
			
				|  |  | +    function setMaxMin(){
 | 
	
		
			
				|  |  | +      if (isFullScreen == false) {
 | 
	
		
			
				|  |  | +        let i = maxMin.querySelector('.el-icon-full-screen');
 | 
	
		
			
				|  |  | +        i.classList.remove('el-icon-full-screen');
 | 
	
		
			
				|  |  | +        i.classList.add('el-icon-crop');
 | 
	
		
			
				|  |  | +        maxMin.title = '还原';
 | 
	
		
			
				|  |  | +        bodyHeight = dragDom.querySelector('.el-dialog__body').offsetHeight+'px';
 | 
	
		
			
				|  |  | +        nowHight = dragDom.clientHeight;
 | 
	
		
			
				|  |  | +        nowWidth = dragDom.clientWidth;
 | 
	
		
			
				|  |  | +        nowMarginTop = dragDom.style.marginTop;
 | 
	
		
			
				|  |  | +        dragDom.style.left = 0;
 | 
	
		
			
				|  |  | +        dragDom.style.top = 0;
 | 
	
		
			
				|  |  | +        dragDom.style.height = "100VH";
 | 
	
		
			
				|  |  | +        dragDom.style.width = "100VW";
 | 
	
		
			
				|  |  | +        dragDom.style.marginTop = 0;
 | 
	
		
			
				|  |  | +        isFullScreen = true;
 | 
	
		
			
				|  |  | +        dialogHeaderEl.style.cursor = 'initial';
 | 
	
		
			
				|  |  | +        dialogHeaderEl.onmousedown = null;
 | 
	
		
			
				|  |  | +        if(!hasSetBodyHight) {
 | 
	
		
			
				|  |  | +          dragDom.querySelector('.el-dialog__body').style.height = 'calc(100% - '+dialogHeaderEl.offsetHeight+'px)';
 | 
	
		
			
				|  |  | +          hasSetBodyHight = true;
 | 
	
		
			
				|  |  | +        }
 | 
	
		
			
				|  |  | +      } else {
 | 
	
		
			
				|  |  | +        let i = maxMin.querySelector('.el-icon-crop');
 | 
	
		
			
				|  |  | +        i.classList.remove('el-icon-crop');
 | 
	
		
			
				|  |  | +        i.classList.add('el-icon-full-screen');
 | 
	
		
			
				|  |  | +        maxMin.innerHTML = '<i class="el-icon-full-screen"></i>';
 | 
	
		
			
				|  |  | +        maxMin.title = '最大化';
 | 
	
		
			
				|  |  | +        dragDom.style.height = "auto";
 | 
	
		
			
				|  |  | +        dragDom.style.width = nowWidth + 'px';
 | 
	
		
			
				|  |  | +        dragDom.style.marginTop = nowMarginTop;
 | 
	
		
			
				|  |  | +        isFullScreen = false;
 | 
	
		
			
				|  |  | +        dialogHeaderEl.style.cursor = 'move';
 | 
	
		
			
				|  |  | +        dialogHeaderEl.onmousedown = moveDown;
 | 
	
		
			
				|  |  | +        dragDom.querySelector('.el-dialog__body').style.height = bodyHeight;
 | 
	
		
			
				|  |  | +        hasSetBodyHight = false;
 | 
	
		
			
				|  |  | +      }
 | 
	
		
			
				|  |  | +    }
 | 
	
		
			
				|  |  | +    //点击放大缩小效果
 | 
	
		
			
				|  |  | +    maxMin.onclick = setMaxMin;
 | 
	
		
			
				|  |  | +    //双击头部效果
 | 
	
		
			
				|  |  | +    dialogHeaderEl.ondblclick = setMaxMin;
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +    //拉伸
 | 
	
		
			
				|  |  | +    let resizeEl=document.createElement("div");
 | 
	
		
			
				|  |  | +    dragDom.appendChild(resizeEl);
 | 
	
		
			
				|  |  | +    //在弹窗右下角加上一个10-10px的控制块
 | 
	
		
			
				|  |  | +    resizeEl.style.cursor = 'se-resize';
 | 
	
		
			
				|  |  | +    resizeEl.style.position = 'absolute';
 | 
	
		
			
				|  |  | +    resizeEl.style.height = '10px';
 | 
	
		
			
				|  |  | +    resizeEl.style.width = '10px';
 | 
	
		
			
				|  |  | +    resizeEl.style.right = '0px';
 | 
	
		
			
				|  |  | +    resizeEl.style.bottom = '0px';
 | 
	
		
			
				|  |  | +    //鼠标拉伸弹窗
 | 
	
		
			
				|  |  | +    resizeEl.onmousedown = (e) => {
 | 
	
		
			
				|  |  | +      // 记录初始x位置
 | 
	
		
			
				|  |  | +      const clientX = e.clientX;
 | 
	
		
			
				|  |  | +      // 鼠标按下,计算当前元素距离可视区的距离
 | 
	
		
			
				|  |  | +      const disX = e.clientX - resizeEl.offsetLeft;
 | 
	
		
			
				|  |  | +      const disY = e.clientY - resizeEl.offsetTop;
 | 
	
		
			
				|  |  | +      document.onmousemove = function (e) {
 | 
	
		
			
				|  |  | +        e.preventDefault(); // 移动时禁用默认事件
 | 
	
		
			
				|  |  | +        // 通过事件委托,计算移动的距离
 | 
	
		
			
				|  |  | +        const x = e.clientX - disX + (e.clientX - clientX);//这里 由于elementUI的dialog控制居中的,所以水平拉伸效果是双倍
 | 
	
		
			
				|  |  | +        const y = e.clientY - disY;
 | 
	
		
			
				|  |  | +        //比较是否小于最小宽高
 | 
	
		
			
				|  |  | +        dragDom.style.width = x > minWidth ? `${x}px` : minWidth + 'px';
 | 
	
		
			
				|  |  | +        dragDom.style.height = y > minHeight ? `${y}px` : minHeight + 'px';
 | 
	
		
			
				|  |  | +        if(!hasSetBodyHight) {
 | 
	
		
			
				|  |  | +          dragDom.querySelector('.el-dialog__body').style.height = 'calc(100% - '+dialogHeaderEl.offsetHeight+'px)';
 | 
	
		
			
				|  |  | +          hasSetBodyHight = true;
 | 
	
		
			
				|  |  | +        }
 | 
	
		
			
				|  |  | +      };
 | 
	
		
			
				|  |  | +      //拉伸结束
 | 
	
		
			
				|  |  | +      document.onmouseup = function (e) {
 | 
	
		
			
				|  |  | +        document.onmousemove = null;
 | 
	
		
			
				|  |  | +        document.onmouseup = null;
 | 
	
		
			
				|  |  | +      };
 | 
	
		
			
				|  |  | +    }
 | 
	
		
			
				|  |  | +  },
 | 
	
		
			
				|  |  |    created() {
 | 
	
		
			
				|  |  |      this.getList();
 | 
	
		
			
				|  |  |      this.getDicts("storage_type").then((response) => {
 | 
	
	
		
			
				|  | @@ -3081,7 +3234,6 @@ export default {
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  |      /** 查询部门下拉树结构 */
 | 
	
		
			
				|  |  |      treeseLect(tree){
 | 
	
		
			
				|  |  | -      console.log(tree)
 | 
	
		
			
				|  |  |        this.queryParams.fWarehouselocid = tree.id
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  |      getTreeselect(row) {
 | 
	
	
		
			
				|  | @@ -3157,7 +3309,6 @@ export default {
 | 
	
		
			
				|  |  |            this.$set(this.form, "fBsdate", Date.parse(this.form.fBsdate));
 | 
	
		
			
				|  |  |            this.$set(this.form, "createTime", Date.parse(this.form.createTime));
 | 
	
		
			
				|  |  |            this.$set(this.form, "fTrademodeid", this.form.fTrademodeid + "");
 | 
	
		
			
				|  |  | -          console.log(this.form.fPlannetweight)
 | 
	
		
			
				|  |  |            this.$set(
 | 
	
		
			
				|  |  |              this.form,
 | 
	
		
			
				|  |  |              "fPlannetweight",
 | 
	
	
		
			
				|  | @@ -3187,7 +3338,6 @@ export default {
 | 
	
		
			
				|  |  |              this.$set(this.warehouseDrList[dr], "fAmount", this.warehouseDrList[dr].fAmount.toFixed(2));
 | 
	
		
			
				|  |  |            }
 | 
	
		
			
				|  |  |            this.warehouseCrList = response.data.warehousebillsfeesCr;
 | 
	
		
			
				|  |  | -          console.log("zhangs1")
 | 
	
		
			
				|  |  |            for (let cr in this.warehouseCrList) {
 | 
	
		
			
				|  |  |              this.$set(this.warehouseCrList[cr], "fFeeunitid", this.warehouseCrList[cr].fFeeunitid + "");
 | 
	
		
			
				|  |  |            }
 | 
	
	
		
			
				|  | @@ -3319,14 +3469,9 @@ export default {
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  |      // 查询作业费信息
 | 
	
		
			
				|  |  |      getWhgenlegListt(kye) {
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  | -      console.log("00000")
 | 
	
		
			
				|  |  | -      console.log(kye)
 | 
	
		
			
				|  |  |        let data = {}
 | 
	
		
			
				|  |  |        let fTaskType = kye
 | 
	
		
			
				|  |  |        if (kye == 2){
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  | -        console.log("2222")
 | 
	
		
			
				|  |  |          this.Navigation = true
 | 
	
		
			
				|  |  |          data = {
 | 
	
		
			
				|  |  |            pageNum:1,
 | 
	
	
		
			
				|  | @@ -3336,7 +3481,6 @@ export default {
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  |          this.key_s = kye
 | 
	
		
			
				|  |  |        }else if (kye == 1) {
 | 
	
		
			
				|  |  | -        console.log("11111")
 | 
	
		
			
				|  |  |          this.Navigation = true
 | 
	
		
			
				|  |  |          data = {
 | 
	
		
			
				|  |  |            pageNum:1,
 | 
	
	
		
			
				|  | @@ -3346,7 +3490,6 @@ export default {
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  |          this.key_s = kye
 | 
	
		
			
				|  |  |        }else {
 | 
	
		
			
				|  |  | -        console.log("3333")
 | 
	
		
			
				|  |  |          this.Navigation = false
 | 
	
		
			
				|  |  |          data = {
 | 
	
		
			
				|  |  |            pageNum:1,
 | 
	
	
		
			
				|  | @@ -3356,10 +3499,8 @@ export default {
 | 
	
		
			
				|  |  |          this.key_s = kye
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  |        operationAgreement(data).then((response) => {
 | 
	
		
			
				|  |  | -        console.log(response)
 | 
	
		
			
				|  |  |          this.tasklegList = response.rows;
 | 
	
		
			
				|  |  |          this.whgenlegTotal = response.total;
 | 
	
		
			
				|  |  | -        console.log(this.tasklegList)
 | 
	
		
			
				|  |  |        });
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  |      revokeTwo(){
 | 
	
	
		
			
				|  | @@ -3437,9 +3578,7 @@ export default {
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  |          // qty=(qty/1000).toFixed(2);
 | 
	
		
			
				|  |  |          let fAmount = parseFloat(Number(this.dialogWhgenlegList[zhgen].fPrice) * Number(qty)).toFixed(2)
 | 
	
		
			
				|  |  | -        console.log(this.costStatus)
 | 
	
		
			
				|  |  |          if(this.costStatus == '3' ){
 | 
	
		
			
				|  |  | -          console.log("jinzhe")
 | 
	
		
			
				|  |  |            this.warehouseDrList.push({
 | 
	
		
			
				|  |  |                  fQty: qty,
 | 
	
		
			
				|  |  |                  fCorpid: this.dialogWhgenlegList[zhgen].fCorpid,
 | 
	
	
		
			
				|  | @@ -3488,7 +3627,6 @@ export default {
 | 
	
		
			
				|  |  |          //     fMarks:this.form.fMarks,
 | 
	
		
			
				|  |  |          //     fBusinessType:this.$set(this.warehouseCrList,'fBusinessType',this.form.fBusinessType)
 | 
	
		
			
				|  |  |          //   })
 | 
	
		
			
				|  |  | -        //   console.log(this.fQty)
 | 
	
		
			
				|  |  |          // } else {
 | 
	
		
			
				|  |  |          //   this.warehouseDrList.push({
 | 
	
		
			
				|  |  |          //     fQty: qty,
 | 
	
	
		
			
				|  | @@ -3579,7 +3717,6 @@ export default {
 | 
	
		
			
				|  |  |          return false;
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  |        for (let whgen in this.dialogWhgenlegList) {
 | 
	
		
			
				|  |  | -        console.log(this.dialogWhgenlegList)
 | 
	
		
			
				|  |  |          if (!this.form.fMblno || this.form.fMblno === "") {
 | 
	
		
			
				|  |  |            this.$set(this.form, "fMblno", this.dialogWhgenlegList[whgen].fMblno);
 | 
	
		
			
				|  |  |          }
 | 
	
	
		
			
				|  | @@ -3675,7 +3812,7 @@ export default {
 | 
	
		
			
				|  |  |            return false;
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  |          if(this.form.fFeetunit > 3){
 | 
	
		
			
				|  |  | -          this.$message.error('请维护主表计费单位为件数、毛重或净重')
 | 
	
		
			
				|  |  | +          this.$message.error('请维护主表计费单位为件数、毛重(kg)或净重(kg)')
 | 
	
		
			
				|  |  |            return false
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  |          // if (!this.printinglist[li].fBusinessType) {
 | 
	
	
		
			
				|  | @@ -3719,7 +3856,6 @@ export default {
 | 
	
		
			
				|  |  |              }
 | 
	
		
			
				|  |  |            }
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  | -        console.log(this.printinglist)
 | 
	
		
			
				|  |  |          setTimeout(() => {
 | 
	
		
			
				|  |  |            this.openPrintJobSheet = true
 | 
	
		
			
				|  |  |          }, 200);
 | 
	
	
		
			
				|  | @@ -3741,11 +3877,11 @@ export default {
 | 
	
		
			
				|  |  |              return false;
 | 
	
		
			
				|  |  |            }
 | 
	
		
			
				|  |  |            if (!this.printinglist[warehouseCr].fGrossweight) {
 | 
	
		
			
				|  |  | -            this.$message.error("请选择入库毛重");
 | 
	
		
			
				|  |  | +            this.$message.error("请选择入库毛重(kg)");
 | 
	
		
			
				|  |  |              return false;
 | 
	
		
			
				|  |  |            }
 | 
	
		
			
				|  |  |            if (!this.printinglist[warehouseCr].fNetweight) {
 | 
	
		
			
				|  |  | -            this.$message.error("请选择入库净重");
 | 
	
		
			
				|  |  | +            this.$message.error("请选择入库净重(kg)");
 | 
	
		
			
				|  |  |              return false;
 | 
	
		
			
				|  |  |            }
 | 
	
		
			
				|  |  |            if (this.printinglist[warehouseCr].fQty) {
 | 
	
	
		
			
				|  | @@ -3829,7 +3965,6 @@ export default {
 | 
	
		
			
				|  |  |        });
 | 
	
		
			
				|  |  |        let params = { pageNum: 1, pageSize: 10, fTypeid: 2}
 | 
	
		
			
				|  |  |        listCorps(params).then((response) => {
 | 
	
		
			
				|  |  | -        console.log(response)
 | 
	
		
			
				|  |  |          this.fleetOptions = response.rows;
 | 
	
		
			
				|  |  |        });
 | 
	
		
			
				|  |  |        this.loading = true;
 | 
	
	
		
			
				|  | @@ -4013,7 +4148,6 @@ export default {
 | 
	
		
			
				|  |  |        let fId = row.fId || this.ids;
 | 
	
		
			
				|  |  |        this.dataList = [];
 | 
	
		
			
				|  |  |        this.goodsRemoteMethod()
 | 
	
		
			
				|  |  | -      console.log(fId)
 | 
	
		
			
				|  |  |        if (fId.length === 1){
 | 
	
		
			
				|  |  |          fId = fId[0].fId
 | 
	
		
			
				|  |  |        }
 | 
	
	
		
			
				|  | @@ -4078,8 +4212,6 @@ export default {
 | 
	
		
			
				|  |  |          for (let cr in this.warehouseCrList) {
 | 
	
		
			
				|  |  |            this.$set(this.warehouseCrList[cr], "fFeeunitid", this.warehouseCrList[cr].fFeeunitid + "");
 | 
	
		
			
				|  |  |            this.$set(this.warehouseDrList[cr], "fBusinessType", this.warehouseDrList[cr].fBusinessType + "");
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  | -          console.log(this.warehouseDrList[cr].fBusinessType)
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  |          this.userOptions = response.data.sysUser;
 | 
	
		
			
				|  |  |          this.open = true;
 | 
	
	
		
			
				|  | @@ -4271,10 +4403,10 @@ export default {
 | 
	
		
			
				|  |  |          this.$set(row, 'fQty', (fGrossweight/1000).toFixed(2))
 | 
	
		
			
				|  |  |        }else if (row.fFeeunitid == "3") {
 | 
	
		
			
				|  |  |          this.$set(row, 'fQty', (fNetweight/1000).toFixed(2))
 | 
	
		
			
				|  |  | -      }else if (row.fFeeunitid == "4") {
 | 
	
		
			
				|  |  | -        this.$set(row, 'fQty', (volumn/1000).toFixed(2))
 | 
	
		
			
				|  |  | -      }else if (row.fFeeunitid == "5") {
 | 
	
		
			
				|  |  | -        this.$set(row, 'fQty', (fixed/1000).toFixed(2))
 | 
	
		
			
				|  |  | +      }else if(row.fFeeunitid == "7"){
 | 
	
		
			
				|  |  | +        this.$set(row, "fQty", this.fCntqty.toFixed(2));
 | 
	
		
			
				|  |  | +      } else {
 | 
	
		
			
				|  |  | +        this.$set(row, "fQty", 0);
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  |        if (row.fUnitprice) {
 | 
	
		
			
				|  |  |          this.$set(row, 'fAmount', parseFloat(Number(row.fUnitprice) * Number(row.fQty)).toFixed(2))
 | 
	
	
		
			
				|  | @@ -4285,7 +4417,7 @@ export default {
 | 
	
		
			
				|  |  |        this.$refs["form"].validate((valid) => {
 | 
	
		
			
				|  |  |          for (let warehouseCr in this.dataListSelection) {
 | 
	
		
			
				|  |  |            if(this.form.fFeetunit > 3){
 | 
	
		
			
				|  |  | -            this.$message.error('请维护主表计费单位为件数、毛重或净重')
 | 
	
		
			
				|  |  | +            this.$message.error('请维护主表计费单位为件数、毛重(kg)或净重(kg)')
 | 
	
		
			
				|  |  |              return false
 | 
	
		
			
				|  |  |            }
 | 
	
		
			
				|  |  |            if (this.dataListSelection[warehouseCr].fBillstatus === 10) {
 | 
	
	
		
			
				|  | @@ -4298,10 +4430,10 @@ export default {
 | 
	
		
			
				|  |  |                this.$message.error('请维护出库件数')
 | 
	
		
			
				|  |  |                return false
 | 
	
		
			
				|  |  |            } else if (!this.dataListSelection[warehouseCr].fGrossweight || this.dataListSelection[warehouseCr].fGrossweight === 0) {
 | 
	
		
			
				|  |  | -            this.$message.error('请维护出库毛重')
 | 
	
		
			
				|  |  | +            this.$message.error('请维护出库毛重(kg)')
 | 
	
		
			
				|  |  |              return false
 | 
	
		
			
				|  |  |            } else if (!this.dataListSelection[warehouseCr].fNetweight || this.dataListSelection[warehouseCr].fNetweight === 0) {
 | 
	
		
			
				|  |  | -            this.$message.error('请维护出库净重')
 | 
	
		
			
				|  |  | +            this.$message.error('请维护出库净重(kg)')
 | 
	
		
			
				|  |  |              return false
 | 
	
		
			
				|  |  |            } else if (!this.dataListSelection[warehouseCr].fBusinessType) {
 | 
	
		
			
				|  |  |              this.$message.error('请维护业务类型')
 | 
	
	
		
			
				|  | @@ -4310,10 +4442,10 @@ export default {
 | 
	
		
			
				|  |  |                this.$message.error('请维护业务详情')
 | 
	
		
			
				|  |  |                return false
 | 
	
		
			
				|  |  |            } else if (!this.dataListSelection[warehouseCr].fGrossweight) {
 | 
	
		
			
				|  |  | -            this.$message.error("请选择入库毛重");
 | 
	
		
			
				|  |  | +            this.$message.error("请选择入库毛重(kg)");
 | 
	
		
			
				|  |  |              return false;
 | 
	
		
			
				|  |  |            } else if (!this.dataListSelection[warehouseCr].fNetweight) {
 | 
	
		
			
				|  |  | -            this.$message.error("请选择入库净重");
 | 
	
		
			
				|  |  | +            this.$message.error("请选择入库净重(kg)");
 | 
	
		
			
				|  |  |              return false;
 | 
	
		
			
				|  |  |            } else if (!this.dataListSelection[warehouseCr].fQty) {
 | 
	
		
			
				|  |  |              this.$message.error("请维护出库件数");
 | 
	
	
		
			
				|  | @@ -4459,7 +4591,6 @@ export default {
 | 
	
		
			
				|  |  |        this.$refs['form'].validate((valid) => {
 | 
	
		
			
				|  |  |          if (valid) {
 | 
	
		
			
				|  |  |            let withdrawList = JSON.parse(JSON.stringify(this.dataListSelection))
 | 
	
		
			
				|  |  | -          console.log(withdrawList)
 | 
	
		
			
				|  |  |            let formData = new window.FormData()
 | 
	
		
			
				|  |  |            formData.append("warehouseBills", JSON.stringify(this.form));
 | 
	
		
			
				|  |  |            formData.append("tEnclosure", JSON.stringify(this.relevantAttachments));
 | 
	
	
		
			
				|  | @@ -4477,7 +4608,6 @@ export default {
 | 
	
		
			
				|  |  |                }
 | 
	
		
			
				|  |  |              }
 | 
	
		
			
				|  |  |              this.msgSuccess('装货成功')
 | 
	
		
			
				|  |  | -            console.log(this.dataList)
 | 
	
		
			
				|  |  |            })
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  |        })
 | 
	
	
		
			
				|  | @@ -4576,14 +4706,12 @@ export default {
 | 
	
		
			
				|  |  |            setTimeout(() => {
 | 
	
		
			
				|  |  |              this.form.fBillstatus = 2
 | 
	
		
			
				|  |  |              let formData = new window.FormData()
 | 
	
		
			
				|  |  | -            console.log(this.form)
 | 
	
		
			
				|  |  |              formData.append("warehouseBills", JSON.stringify(this.form));
 | 
	
		
			
				|  |  |              formData.append("warehousebillsitems", JSON.stringify(this.dataList));
 | 
	
		
			
				|  |  |              formData.append("tEnclosure", JSON.stringify(this.relevantAttachments));
 | 
	
		
			
				|  |  |              formData.append("warehousebillsfeesCr", JSON.stringify(this.warehouseCrList));
 | 
	
		
			
				|  |  |              formData.append("warehousebillsfeesDr", JSON.stringify(this.warehouseDrList));
 | 
	
		
			
				|  |  |              addWarehousebills(formData).then((response) => {
 | 
	
		
			
				|  |  | -              console.log(response)
 | 
	
		
			
				|  |  |                this.msgSuccess('保存成功')
 | 
	
		
			
				|  |  |                this.form = response.data.warehouseBills
 | 
	
		
			
				|  |  |                this.$set(this.form, 'fEta', Date.parse(this.form.fEta))
 | 
	
	
		
			
				|  | @@ -4607,7 +4735,6 @@ export default {
 | 
	
		
			
				|  |  |      /** 提交按钮 */
 | 
	
		
			
				|  |  |      //作业类型校验
 | 
	
		
			
				|  |  |      educationChange() {
 | 
	
		
			
				|  |  | -      console.log(this.form.fBusinessType)
 | 
	
		
			
				|  |  |        if (this.form.fBusinessType === '0' || this.form.fBusinessType === '1') {
 | 
	
		
			
				|  |  |          this.isrequired = 1
 | 
	
		
			
				|  |  |        }else if(this.form.fBusinessType === '5'){
 | 
	
	
		
			
				|  | @@ -4615,7 +4742,6 @@ export default {
 | 
	
		
			
				|  |  |          this.isrequired_l = 1
 | 
	
		
			
				|  |  |          this.isrequired_s = 2
 | 
	
		
			
				|  |  |        }else if(this.form.fBusinessType === '2' || this.form.fBusinessType === '3' || this.form.fBusinessType === '4'){
 | 
	
		
			
				|  |  | -        console.log("333")
 | 
	
		
			
				|  |  |          this.isrequired_s = 1
 | 
	
		
			
				|  |  |          this.isrequired = 2
 | 
	
		
			
				|  |  |        }else{
 |