Selaa lähdekoodia

计价单位修改

wengyuwen 4 vuotta sitten
vanhempi
commit
52adf09325

+ 15 - 15
src/views/basicdata/warehousebills/index.vue

@@ -119,7 +119,7 @@ RK CK DB HZ
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="计划毛重,单位为吨,保留6位小数,由明细表自动合计生成" prop="fPlangrossweight">
+      <el-form-item label="计划毛重(kg),单位为吨,保留6位小数,由明细表自动合计生成" prop="fPlangrossweight">
         <el-input
           v-model="queryParams.fPlangrossweight"
           placeholder="请输入计划毛重,单位为吨,保留6位小数,由明细表自动合计生成"
@@ -128,7 +128,7 @@ RK CK DB HZ
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="计划净重,由明细表自动合计生成" prop="fPlannetweight">
+      <el-form-item label="计划净重(kg),由明细表自动合计生成" prop="fPlannetweight">
         <el-input
           v-model="queryParams.fPlannetweight"
           placeholder="请输入计划净重,由明细表自动合计生成"
@@ -146,7 +146,7 @@ RK CK DB HZ
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="毛重,由明细表自动合计生成" prop="fGrossweight">
+      <el-form-item label="毛重(kg),由明细表自动合计生成" prop="fGrossweight">
         <el-input
           v-model="queryParams.fGrossweight"
           placeholder="请输入毛重,由明细表自动合计生成"
@@ -155,7 +155,7 @@ RK CK DB HZ
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="净重,由明细表自动合计生成" prop="fNetweight">
+      <el-form-item label="净重(kg),由明细表自动合计生成" prop="fNetweight">
         <el-input
           v-model="queryParams.fNetweight"
           placeholder="请输入净重,由明细表自动合计生成"
@@ -174,7 +174,7 @@ RK CK DB HZ
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="计费单位(数据字典),下拉选择毛重或净重" prop="fFeetunit">
+      <el-form-item label="计费单位(数据字典),下拉选择毛重(kg)或净重(kg)" prop="fFeetunit">
         <el-input
           v-model="queryParams.fFeetunit"
           placeholder="请输入计费单位(数据字典),下拉选择毛重或净重"
@@ -349,13 +349,13 @@ RK CK DB HZ
       </el-table-column>
       <el-table-column label="货物品名,t_goods 中的no或 name,模糊查找选择后,存储f_id,显示name" align="center" prop="fGoodsid" />
       <el-table-column label="计划件数,由明细表自动合计生成" align="center" prop="fPlanqty" />
-      <el-table-column label="计划毛重,单位为吨,保留6位小数,由明细表自动合计生成" align="center" prop="fPlangrossweight" />
-      <el-table-column label="计划净重,由明细表自动合计生成" align="center" prop="fPlannetweight" />
+      <el-table-column label="计划毛重(kg),单位为吨,保留6位小数,由明细表自动合计生成" align="center" prop="fPlangrossweight" />
+      <el-table-column label="计划净重(kg),由明细表自动合计生成" align="center" prop="fPlannetweight" />
       <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="贸易方式(数据字典),对应t_trademodels " align="center" prop="fTrademodeid" :formatter="fTrademodeidFormat" />
-      <el-table-column label="计费单位(数据字典),下拉选择毛重或净重" align="center" prop="fFeetunit" />
+      <el-table-column label="计费单位(数据字典),下拉选择毛重(kg)或净重(kg)" align="center" prop="fFeetunit" />
       <el-table-column label="提单号" align="center" prop="fMblno" />
       <el-table-column label="船名航次" align="center" prop="fVslvoy" />
       <el-table-column label="到港日期" align="center" prop="fEta" width="180">
@@ -460,19 +460,19 @@ RK CK DB HZ
         <el-form-item label="计划件数,由明细表自动合计生成" prop="fPlanqty">
           <el-input v-model="form.fPlanqty" placeholder="请输入计划件数,由明细表自动合计生成" />
         </el-form-item>
-        <el-form-item label="计划毛重,单位为吨,保留6位小数,由明细表自动合计生成" prop="fPlangrossweight">
+        <el-form-item label="计划毛重(kg),单位为吨,保留6位小数,由明细表自动合计生成" prop="fPlangrossweight">
           <el-input v-model="form.fPlangrossweight" placeholder="请输入计划毛重,单位为吨,保留6位小数,由明细表自动合计生成" />
         </el-form-item>
-        <el-form-item label="计划净重,由明细表自动合计生成" prop="fPlannetweight">
+        <el-form-item label="计划净重(kg),由明细表自动合计生成" prop="fPlannetweight">
           <el-input v-model="form.fPlannetweight" placeholder="请输入计划净重,由明细表自动合计生成" />
         </el-form-item>
         <el-form-item label="件数,由明细表自动合计生成" prop="fQty">
           <el-input v-model="form.fQty" placeholder="请输入件数,由明细表自动合计生成" />
         </el-form-item>
-        <el-form-item label="毛重,由明细表自动合计生成" prop="fGrossweight">
+        <el-form-item label="毛重(kg),由明细表自动合计生成" prop="fGrossweight">
           <el-input v-model="form.fGrossweight" placeholder="请输入毛重,由明细表自动合计生成" />
         </el-form-item>
-        <el-form-item label="净重,由明细表自动合计生成" prop="fNetweight">
+        <el-form-item label="净重(kg),由明细表自动合计生成" prop="fNetweight">
           <el-input v-model="form.fNetweight" placeholder="请输入净重,由明细表自动合计生成" />
         </el-form-item>
         <el-form-item label="贸易方式(数据字典),对应t_trademodels " prop="fTrademodeid">
@@ -485,7 +485,7 @@ RK CK DB HZ
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="计费单位(数据字典),下拉选择毛重或净重" prop="fFeetunit">
+        <el-form-item label="计费单位(数据字典),下拉选择毛重(kg)或净重(kg)" prop="fFeetunit">
           <el-input v-model="form.fFeetunit" placeholder="请输入计费单位(数据字典),下拉选择毛重或净重" />
         </el-form-item>
         <el-form-item label="提单号" prop="fMblno">

+ 10 - 10
src/views/reportManagement/Statistics/index.vue

@@ -178,8 +178,8 @@
         width="120"
       />
       <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 v-if="queryParams.fBilltype === 'SJRK'" label="入库件数" align="center" prop="fQty" width="120"/>-->
 <!--      <el-table-column v-if="queryParams.fBilltype === 'SJCK'" label="出库件数" align="center" prop="fQty" width="120"/>-->
@@ -235,10 +235,10 @@
         <el-form-item label="上期件数" prop="fPreqty">
           <el-input v-model="form.fPreqty" placeholder="请输入上期件数" />
         </el-form-item>
-        <el-form-item label="上期毛重,单位为吨,保留6位小数" prop="fPregrossweight">
+        <el-form-item label="上期毛重(kg),单位为吨,保留6位小数" prop="fPregrossweight">
           <el-input v-model="form.fPregrossweight" placeholder="请输入上期毛重,单位为吨,保留6位小数" />
         </el-form-item>
-        <el-form-item label="上期净重," prop="fPrenetweight">
+        <el-form-item label="上期净重(kg)," prop="fPrenetweight">
           <el-input v-model="form.fPrenetweight" placeholder="请输入上期净重," />
         </el-form-item>
         <el-form-item label="入库件数" prop="fQtyd">
@@ -247,10 +247,10 @@
         <el-form-item label="入库尺码" prop="fVolumnd">
           <el-input v-model="form.fVolumnd" placeholder="请输入入库尺码" />
         </el-form-item>
-        <el-form-item label="入库毛重" prop="fGrossweightd">
+        <el-form-item label="入库毛重(kg)" prop="fGrossweightd">
           <el-input v-model="form.fGrossweightd" placeholder="请输入入库毛重" />
         </el-form-item>
-        <el-form-item label="入库净重" prop="fNetweightd">
+        <el-form-item label="入库净重(kg)" prop="fNetweightd">
           <el-input v-model="form.fNetweightd" placeholder="请输入入库净重" />
         </el-form-item>
         <el-form-item label="出口尺码" prop="fVolumnc">
@@ -262,13 +262,13 @@
         <el-form-item label="结余件数" prop="fQtyblc">
           <el-input v-model="form.fQtyblc" placeholder="请输入结余件数" />
         </el-form-item>
-        <el-form-item label="出库毛重,单位为吨" prop="fGrossweightc">
-          <el-input v-model="form.fGrossweightc" placeholder="请输入出库毛重,单位为吨" />
+        <el-form-item label="出库毛重(kg),单位为吨" prop="fGrossweightc">
+          <el-input v-model="form.fGrossweightc" placeholder="请输入出库毛重(kg),单位为吨" />
         </el-form-item>
-        <el-form-item label="出库净重" prop="fNetweightc">
+        <el-form-item label="出库净重(kg)" prop="fNetweightc">
           <el-input v-model="form.fNetweightc" placeholder="请输入出库净重" />
         </el-form-item>
-        <el-form-item label="结余毛重" prop="fGrossweightblc">
+        <el-form-item label="结余毛重(kg)" prop="fGrossweightblc">
           <el-input v-model="form.fGrossweightblc" placeholder="请输入结余毛重" />
         </el-form-item>
         <el-form-item label="结余净重" prop="fNetweightblc">

+ 6 - 6
src/views/reportManagement/whgenleg/index.vue

@@ -140,15 +140,15 @@
       />
       <el-table-column label="入库件数" align="center" prop="fQtyD" width="120"/>
 <!--      <el-table-column label="入库尺码" align="center" prop="fVolumnD" />-->
-      <el-table-column label="入库毛重" align="center" prop="fGrossweightD" width="120"/>
-      <el-table-column label="入库净重" align="center" prop="fNetweightD" width="120"/>
+      <el-table-column label="入库毛重(kg)" align="center" prop="fGrossweightD" width="120"/>
+      <el-table-column label="入库净重(kg)" align="center" prop="fNetweightD" width="120"/>
 <!--      <el-table-column label="出库尺码" align="center" prop="fVolumnC" />-->
       <el-table-column label="出库件数" align="center" prop="fQtyC" width="120"/>
-      <el-table-column label="出库毛重" align="center" prop="fGrossweightC" width="120"/>
-      <el-table-column label="出库净重" align="center" prop="fNetweightC" width="120"/>
+      <el-table-column label="出库毛重(kg)" align="center" prop="fGrossweightC" width="120"/>
+      <el-table-column label="出库净重(kg)" align="center" prop="fNetweightC" width="120"/>
       <el-table-column label="结余件数" align="center" prop="fQtyblc" width="120"/>
-      <el-table-column label="结余毛重" align="center" prop="fGrossweightblc" width="120"/>
-      <el-table-column label="结余净重" align="center" prop="fNetweightblc" width="120"/>
+      <el-table-column label="结余毛重(kg)" align="center" prop="fGrossweightblc" width="120"/>
+      <el-table-column label="结余净重(kg)" align="center" prop="fNetweightblc" width="120"/>
       <el-table-column label="箱号" align="center" prop="fCntrno" width="120"/>
       <el-table-column label="备注" align="center" prop="remark" width="120"/>
       <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">

+ 21 - 25
src/views/warehouseBusiness/goodsTransfer/index.vue

@@ -251,8 +251,8 @@
       />
       <el-table-column label="仓库" align="center" prop="fWarehouseid"/>
       <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
         width="100"
         label="货转状态"
@@ -713,7 +713,7 @@
           header-align="center"
           align="center"
           width="180px"
-          label="*库存毛重"
+          label="*库存毛重(kg)"
         >
         </el-table-column>
         <el-table-column
@@ -721,7 +721,7 @@
           header-align="center"
           width="180px"
           align="center"
-          label="*库存净重"
+          label="*库存净重(kg)"
         >
         </el-table-column>
         <el-table-column
@@ -747,7 +747,7 @@
           header-align="center"
           width="180px"
           align="center"
-          label="*货转毛重"
+          label="*货转毛重(kg)"
         >
           <template slot-scope="scope">
             <el-input
@@ -765,7 +765,7 @@
           header-align="center"
           width="180px"
           align="center"
-          label="*货转净重"
+          label="*货转净重(kg)"
         >
           <template slot-scope="scope">
             <el-input
@@ -2494,8 +2494,6 @@
           this.$set(this.form, 'fBsdate', Date.parse(this.form.fBsdate))
           this.open = true
           this.title = '修改货存转移'
-          console.log(this.Operator)
-          console.log(this.Lander)
         })
       },
 
@@ -2506,7 +2504,6 @@
         this.browseStatus = true
         const fId = row.fId || this.ids
         getGoodsTransfer(fId).then((response) => {
-          console.log(response.data.corps[0].createBy)
           this.Operator = response.data.corps[0].createBy
           this.form = response.data.warehousebills
           this.$set(this.form, 'fStltypeid', this.form.fStltypeid + '')
@@ -2545,8 +2542,6 @@
           this.$set(this.form, 'fBsdate', Date.parse(this.form.fBsdate))
           this.open = true
           this.title = '修改货存转移'
-          console.log(this.Operator)
-          console.log(this.Lander)
         })
       },
 
@@ -2675,7 +2670,7 @@
           if (valid) {
             for (let li in this.dataList) {
               if(this.form.fFeetunit > 3){
-                this.$message.error('请维护主表计费单位为件数、毛重或净重')
+                this.$message.error('请维护主表计费单位为件数、毛重(kg)或净重(kg)')
                 return false
               }
               if (!this.dataList[li].fWarehouselocids) {
@@ -2687,11 +2682,11 @@
                 return false
               }
               if (!this.dataList[li].fGrossweight) {
-                this.$message({ message: '请维护第' + Number(li) + 1 + '行货转毛重', type: 'warning' })
+                this.$message({ message: '请维护第' + Number(li) + 1 + '行货转毛重(kg)', type: 'warning' })
                 return false
               }
               if (!this.dataList[li].fNetweight) {
-                this.$message({ message: '请维护第' + Number(li) + 1 + '行货转净重', type: 'warning' })
+                this.$message({ message: '请维护第' + Number(li) + 1 + '行货转净重(kg)', type: 'warning' })
                 return false
               }
               if (!this.dataList[li].fPackagespecs) {
@@ -2839,7 +2834,7 @@
               return false
             }
             if (!this.dataList[list].fGrossweight || Number(this.dataList[list].fGrossweight) === 0) {
-              this.$message.error('请维护序号为' + (Number(list) + 1) + '的货转毛重!')
+              this.$message.error('请维护序号为' + (Number(list) + 1) + '的货转毛重(kg)!')
               return false
             }
           }
@@ -2885,7 +2880,7 @@
               return false
             }
             if (!this.dataList[list].fGrossweight || Number(this.dataList[list].fGrossweight) === 0) {
-              this.$message.error('请维护序号为' + (Number(list) + 1) + '的货转毛重!')
+              this.$message.error('请维护序号为' + (Number(list) + 1) + '的货转毛重(kg)!')
               return false
             }
           }
@@ -2998,11 +2993,11 @@
           fGrossweight = row.fGrossweight
         }
         if (row.fPlannetweight < fNetweight) {
-          this.$message({ message: '货转净重超出结余净重', type: 'warning' })
+          this.$message({ message: '货转净重(kg)超出结余净重(kg)', type: 'warning' })
           return false
         }
         if (row.fPlangrossweight < fGrossweight) {
-          this.$message({ message: '货转毛重超出结余毛重', type: 'warning' })
+          this.$message({ message: '货转毛重(kg)超出结余毛重(kg)', type: 'warning' })
           return false
         }
       },
@@ -3018,7 +3013,7 @@
         let fQty = 0;
         let fGrossweight = 0;
         let fNetweight = 0;
-        let volumn = 0;
+        let fCntqty = 0;
         let fixed = 1;
         for (let li in this.dataList) {
           if (this.dataList[li].fQty) {
@@ -3030,8 +3025,8 @@
           if (this.dataList[li].fNetweight) {
             fNetweight = parseFloat(Number(fNetweight) + Number(this.dataList[li].fNetweight)).toFixed(2)
           }
-          if (this.dataList[li].volumn) {
-            volumn = parseFloat(Number(volumn) + Number(this.dataList[li].volumn)).toFixed(2)
+          if (this.dataList[li].fCntqty) {
+            fCntqty = parseFloat(Number(fCntqty) + Number(this.dataList[li].fCntqty))
           }
         }
         if (row.fFeeunitid === "1") {
@@ -3040,10 +3035,11 @@
           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", fCntqty)
+        }else {
+          this.$set(row, "fQty", 0);
         }
         if (row.fUnitprice) {
           this.$set(row, 'fAmount', parseFloat(Number(row.fUnitprice) * Number(row.fQty)).toFixed(2))

+ 16 - 40
src/views/warehouseBusiness/inStock/index.vue

@@ -274,8 +274,8 @@
       <el-table-column label="入库件数" align="center" prop="fQty" />
       <!--      <el-table-column label="入库毛重" align="center" prop="fGrossweight"/>-->
       <!-- <el-table-column label="货转客户名称" align="center" prop="fTocorpid" /> -->
-      <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"/>
@@ -500,7 +500,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%"
@@ -512,7 +512,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")'
@@ -1219,13 +1219,13 @@
               header-align="center"
               width="150px"
               align="center"
-              label="*入库毛重"
+              label="*入库毛重(kg)"
             >
               <template slot-scope="scope">
                 <el-input
                   oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
                   v-model="scope.row.fGrossweight"
-                  placeholder="入库毛重"
+                  placeholder="入库毛重(kg)"
                   :disabled="browseStatus || scope.row.fBillstatus === 40"
                   show-word-limit
                 />
@@ -1236,7 +1236,7 @@
               header-align="center"
               width="150px"
               align="center"
-              label="*入库净重"
+              label="*入库净重(kg)"
             >
               <template slot-scope="scope">
                 <el-input
@@ -2371,7 +2371,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="planningList.fPlannetweight"
                   oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
@@ -2382,7 +2382,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="planningList.fPlangrossweight"
                   oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
@@ -2856,7 +2856,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">
@@ -3338,7 +3338,6 @@ export default {
       this.fleetOptions = response.data;
     });
     treeselect().then(response => {
-      console.log(response)
       this.warehouseOptions = response.data
     })
     this.warehousesssMethod()
@@ -3355,7 +3354,6 @@ export default {
     },
     /** 查询部门下拉树结构 */
     treeseLect(tree){
-      console.log(tree)
       this.queryParams.fWarehouselocid = tree.id
     },
     getTreeselect(row) {
@@ -3363,7 +3361,6 @@ export default {
       this.inDex = row.$index
       this.choiceWarehouse = true
       treeselect(this.form.fWarehouseid).then(response => {
-        console.log(response)
         this.fWarehouseidOptions = response.data;
         this.fWarehouseidOption = response.data;
       })
@@ -3635,7 +3632,7 @@ export default {
     // 新增list
     addRelevant(status) {
       if (!this.form.fPlannetweight || !this.form.fPlangrossweight || !this.form.fPlanqty) {
-        this.$message({ message: "请维护计划净重,计划毛重,计划件数", type: "warning", });
+        this.$message({ message: "请维护计划净重(kg),计划毛重(kg),计划件数", type: "warning", });
         return false;
       }
       this.fPlaNnumber = this.form.fPlannetweight / this.form.fPlanqty;
@@ -3690,16 +3687,13 @@ export default {
       }
     },
     showEditDialog_ss() {
-      console.log("000")
       if (this.Printinglist.length > 0) {
-        console.log("111")
         for (let li in this.Printinglist) {
           if (this.dataListSelection.length > 0) {
             this.fTruckno = this.dataListSelection[0].fTruckno;
             this.fCntrtype = this.dataListSelection[0].fCntrtype;
             this.fGoodsids = this.dataListSelection[0].fGoodsids;
             this.fPackagespecs = this.dataListSelection[0].fPackagespecs;
-            console.log(this.Printinglist)
             var date = new Date(this.dataListSelection[0].fBsdate);
             var Y = date.getFullYear() + "-";
             var M =
@@ -3734,7 +3728,7 @@ export default {
         //   this.form.fId = this.fid
         // }
         if(this.form.fFeetunit > 3){
-          this.$message.error('请维护主表计费单位为件数、毛重或净重')
+          this.$message.error('请维护主表计费单位为件数、毛重(kg)或净重(kg)')
           return false
         }
         if (!this.form.fBusinessType) {
@@ -3808,7 +3802,6 @@ export default {
           }
         }
         if (this.dataListSelection.length > 0) {
-          console.log(this.dataListSelection)
           this.fTruckno = this.dataListSelection[0].fTruckno
           this.fCntrtype = this.dataListSelection[0].fCntrtype
           this.fGoodsids = this.dataListSelection[0].fGoodsids
@@ -3817,7 +3810,6 @@ export default {
           this.fMblno = this.dataListSelection[0].fMblno
           this.fQty = this.dataListSelection[0].fQty
           // this.fQtys = this.dataListSelection[0].fQty
-          console.log(this.fQtys)
           var date = new Date(this.dataListSelection[0].fBsdate)
           var Y = date.getFullYear() + '-'
           var M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-'
@@ -3849,7 +3841,6 @@ export default {
         fMarks:this.form.fMarks,
         fBusinessType:this.$set(this.warehouseDrList,'fBusinessType',this.form.fBusinessType)
       });
-      console.log(this.warehouseDrList)
     },
     addpayment() {
       this.warehouseCrList.push({
@@ -3897,7 +3888,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;
@@ -3940,7 +3930,6 @@ export default {
         }
       }
       operationAgreement(data).then( response => {
-        console.log(response)
         this.tasklegList = response.rows;
         for (let li in this.tasklegList) {
           this.$set(
@@ -4026,7 +4015,6 @@ export default {
         for (let whgen in this.dialogWhgenlegList) {
           let feeId = this.dialogWhgenlegList[whgen].feeFId;
           getFees(feeId).then((response) => {
-            console.log(response)
             this.fWbuOptions.push(response.data);
           });
           let qty = 1;
@@ -4071,7 +4059,6 @@ export default {
         for (let zhgen in this.dialogWhgenlegList) {
           let feeId = this.dialogWhgenlegList[zhgen].feeFId;
           getFees(feeId).then((response) => {
-            console.log(response)
             this.fWbuOptions.push(response.data);
           });
           let qty = 1;
@@ -4089,7 +4076,6 @@ export default {
 
 
           if(this.key_id == 3){
-            console.log("111")
             this.warehouseDrList.push({
               fQty: qty,
               fCorpid: this.dialogWhgenlegList[zhgen].fCorpid,
@@ -4341,10 +4327,8 @@ export default {
       this.detailsHidden = false;
       this.formBrowseStatus = false;
       const fId = row.fId || this.ids;
-      console.log(fId)
       this.goodsRemoteMethod()
       getWarehousebills(fId).then((response) => {
-        console.log(response)
         if (response.data.warehousebills) {
           this.form = response.data.warehousebills;
           this.before = this.form.createBy
@@ -4407,8 +4391,6 @@ export default {
         }
         this.kqhouseOptions = response.data.warehouseAreas;
         this.warehouseDrList = response.data.warehousebillsfeesDr;
-        console.log(this.businessTypeOption)
-        console.log(this.warehouseDrList)
         for (let dr in this.warehouseDrList) {
           this.$set(this.warehouseDrList[dr], "fFeeUnitid", this.warehouseDrList[dr].fFeeunitid + "");
           this.$set(this.warehouseDrList[dr], "fQty", this.warehouseDrList[dr].fQty.toFixed(2));
@@ -4581,7 +4563,9 @@ export default {
       } else if (row.fFeeUnitid === "1") {
         this.$set(row, "fQty", this.fQty.toFixed(2));
       } else if (row.fFeeUnitid === "3") {
-        this.$set(row, "fQty", (this.fNetweight/1000).toFixed(2));
+        this.$set(row, "fQty", (this.fNetweight / 1000).toFixed(2));
+      }else if(row.fFeeUnitid === "7"){
+        this.$set(row, "fQty", this.fCntqty.toFixed(2));
       } else {
         this.$set(row, "fQty", 0);
       }
@@ -4605,7 +4589,7 @@ export default {
       this.$refs['form'].validate((valid) => {
         for (let warehouseCr in this.Printinglist) {
           if(this.form.fFeetunit > 3){
-            this.$message.error('请维护主表计费单位为件数、毛重或净重')
+            this.$message.error('请维护主表计费单位为件数、毛重(kg)或净重(kg)')
             return false
           }
           if (!this.Printinglist[warehouseCr].fQty || this.Printinglist[warehouseCr].fQty === 0) {
@@ -4831,14 +4815,10 @@ export default {
     },
     //作业类型校验
     educationChange() {
-      console.log(this.form.fBusinessType)
       if (this.form.fBusinessType === '1' || this.form.fBusinessType === '2') {
-        console.log("111")
-        console.log("走这")
         this.isrequired = 1
         this.isrequired_s = 2
       }else if(this.form.fBusinessType === '3' || this.form.fBusinessType === '4'){
-        console.log("333")
         this.isrequired_s = 1
         this.isrequired = 2
       }else{
@@ -4871,8 +4851,6 @@ export default {
           let formDatae = new window.FormData()
           // 附件数据
           this.form.fBillingway = this.form.fFeetunit
-          console.log(this.form)
-          console.log(this.dataList)
           formDatae.append('tWarehouseBills', JSON.stringify(this.form))
           // 库存明细
           formDatae.append('tWarehousebillsitems', JSON.stringify(this.dataList))
@@ -4882,7 +4860,6 @@ export default {
           formDatae.append('tWarehousebillsfeesCr', JSON.stringify(this.warehouseCrList))
           // 收款
           formDatae.append('tWarehousebillsfeesDr', JSON.stringify(this.warehouseDrList))
-          console.log(this.form)
           addWarehousebills(formDatae).then((response) => {
             this.msgSuccess('保存成功')
             this.form = response.data.warehouseBills
@@ -5106,7 +5083,6 @@ export default {
       }
       let queryParams = { pageNum: 1, pageSize: 10, fName: name, fTypeid: 2};
       listCorps(queryParams).then((response) => {
-        console.log(response)
         this.fleetOptions = response.rows;
       });
     },

+ 174 - 48
src/views/warehouseBusiness/outStock/index.vue

@@ -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{

+ 24 - 30
src/views/warehouseBusiness/stockTransfer/index.vue

@@ -250,8 +250,8 @@
       <el-table-column label="调入仓库" align="center" prop="fWarehouseid" />
       <el-table-column label="调出仓库" align="center" prop="fInwarehouseid" />
       <el-table-column label="调拨件数" align="center" prop="fPlanqty" />
-      <el-table-column label="调拨毛重" align="center" prop="fPlangrossweight" />
-      <el-table-column label="调拨净重" align="center" prop="fPlannetweight" />
+      <el-table-column label="调拨毛重(kg)" align="center" prop="fPlangrossweight" />
+      <el-table-column label="调拨净重(kg)" align="center" prop="fPlannetweight" />
       <el-table-column label="业务类别" align="center" prop="fBusinessType" :formatter="fBusinessTypeFormat"/>
 
       <el-table-column
@@ -548,7 +548,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="计划调拨净重">
+            <el-form-item label="计划调拨净重(kg)">
               <el-input
                 v-model="form.fPlannetweight"
                 style="width: 80%"
@@ -558,7 +558,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="计划调拨毛重">
+            <el-form-item label="计划调拨毛重(kg)">
               <el-input
                 v-model="form.fPlangrossweight"
                 style="width: 80%"
@@ -966,7 +966,7 @@
               header-align="center"
               align="center"
               width="180px"
-              label="*结余毛重"
+              label="*结余毛重(kg)"
             >
             </el-table-column>
             <el-table-column
@@ -974,7 +974,7 @@
               header-align="center"
               align="center"
               width="180px"
-              label="*结余净重"
+              label="*结余净重(kg)"
             >
             </el-table-column>
             <el-table-column
@@ -1000,7 +1000,7 @@
               header-align="center"
               width="180px"
               align="center"
-              label="*调拨毛重"
+              label="*调拨毛重(kg)"
             >
               <template slot-scope="scope">
                 <el-input
@@ -1018,7 +1018,7 @@
               header-align="center"
               width="180px"
               align="center"
-              label="*调拨净重"
+              label="*调拨净重(kg)"
             >
               <template slot-scope="scope">
                 <el-input
@@ -2264,7 +2264,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">
@@ -3014,8 +3014,6 @@ export default {
     getWhgenlegListt(kye) {
       let daTa = []
       let fTaskType = kye
-
-      console.log(fTaskType)
       if (kye == 2){
         this.Navigation = true
         daTa = {
@@ -3243,7 +3241,6 @@ export default {
           fTransferWarehouselocid: null,
           remark: null,
         });
-        console.log(this.dataList.fOrgWarehouseInformation)
       }
       this.whgenlegVisible = false;
     },
@@ -3386,7 +3383,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;
@@ -3965,15 +3961,13 @@ export default {
         }
       }
       if (row.fFeeunitid == "1") {
-        this.$set(row, 'fQty', this.fQty.toFixed(2))
+        this.$set(row, 'fQty', this.fPlanqty.toFixed(2))
       } else if (row.fFeeunitid == "2") {
-        this.$set(row, 'fQty', (fGrossweight/1000).toFixed(2))
+        this.$set(row, 'fQty', (fPlannetweight/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))
+        this.$set(row, 'fQty', (fPlangrossweight/1000).toFixed(2))
+      }else if (row.fFeeunitid == "7") {
+        this.$set(row, 'fQty', this.fCntqty.toFixed(2))
       }else {
         this.$set(row, "fQty", 0);
       }
@@ -3990,7 +3984,7 @@ export default {
             return false;
           }
           if (!this.dataListSelection[warehouse].fGrossweight) {
-            this.$message.error("请选择调拨毛重");
+            this.$message.error("请选择调拨毛重(kg)");
             return false;
           } else if (!this.dataListSelection[warehouse].fWarehouseInformation) {
             this.$message.error("请选择调入库位");
@@ -3999,7 +3993,7 @@ export default {
             this.$message.error("调拨库区不得与原库区相同");
             return false;
           } else if (!this.dataListSelection[warehouse].fNetweight) {
-            this.$message.error("请选择调拨净重");
+            this.$message.error("请选择调拨净重(kg)");
             return false;
           }
           // else if (!this.dataListSelection[warehouse].fQty) {
@@ -4228,14 +4222,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));
             addStockTransfer(formData).then((response) => {
-              console.log(response)
               this.msgSuccess('保存成功')
               this.form = response.data.warehouseBills
               this.$set(this.form, 'fEta', Date.parse(this.form.fEta))
@@ -4257,14 +4249,10 @@ export default {
     },
     //作业类型校验
     educationChange() {
-      console.log(this.form.fBusinessType)
       if (this.form.fBusinessType === '0') {
-        console.log("111")
-        console.log("走这")
         this.isrequired = 1
         this.isrequired_l = 2
       }else if(this.form.fBusinessType === '1' || this.form.fBusinessType === '3'){
-        console.log("333")
         this.isrequired_l = 1
         this.isrequired = 2
       }else if(this.form.fBusinessType === '2'){
@@ -4531,9 +4519,7 @@ export default {
         fWarehouseid: this.form.fWarehouseid,
         fName: name
       };
-      console.log(this.kqhouseOptions)
       listArea(queryParams).then((response) => {
-        console.log(response)
         this.kqhouseOptions = response.rows;
       });
     },
@@ -4575,4 +4561,12 @@ export default {
 .el-form-item__label {
   font-size: 12px !important;
 }
+.el-collapse-item__header{
+  font-size: 16px;
+  font-weight: bolder;
+  padding-left: 5px;
+}
+.el-icon-s-home,.el-icon-s-order,.el-icon-circle-plus,.el-icon-remove{
+  padding-right: 5px;
+}
 </style>

+ 10 - 10
src/views/warehouseBusiness/warehousebills/index.vue

@@ -554,12 +554,12 @@ RK CK DB HZ
         prop="fPlanqty"
       />
       <el-table-column
-        label="计划毛重,由明细表自动合计生成"
+        label="计划毛重(kg),由明细表自动合计生成"
         align="center"
         prop="fPlangrossweight"
       />
       <el-table-column
-        label="计划净重,由明细表自动合计生成"
+        label="计划净重(kg),由明细表自动合计生成"
         align="center"
         prop="fPlannetweight"
       />
@@ -574,12 +574,12 @@ RK CK DB HZ
         prop="fQty"
       />
       <el-table-column
-        label="毛重,由明细表自动合计生成"
+        label="毛重(kg),由明细表自动合计生成"
         align="center"
         prop="fGrossweight"
       />
       <el-table-column
-        label="净重,由明细表自动合计生成"
+        label="净重(kg),由明细表自动合计生成"
         align="center"
         prop="fNetweight"
       />
@@ -596,7 +596,7 @@ RK CK DB HZ
       />
       <el-table-column label="经营单位(客户列表)" align="center" prop="fSbu" />
       <el-table-column
-        label="计费单位(数据字典),下拉选择毛重或净重"
+        label="计费单位(数据字典),下拉选择毛重(kg)或净重"
         align="center"
         prop="fFeetunit"
         :formatter="fFeetunitFormat"
@@ -789,7 +789,7 @@ RK CK DB HZ
           />
         </el-form-item>
         <el-form-item
-          label="计划毛重,由明细表自动合计生成"
+          label="计划毛重(kg),由明细表自动合计生成"
           prop="fPlangrossweight"
         >
           <el-input
@@ -798,7 +798,7 @@ RK CK DB HZ
           />
         </el-form-item>
         <el-form-item
-          label="计划净重,由明细表自动合计生成"
+          label="计划净重(kg),由明细表自动合计生成"
           prop="fPlannetweight"
         >
           <el-input
@@ -818,13 +818,13 @@ RK CK DB HZ
             placeholder="请输入件数,由明细表自动合计生成"
           />
         </el-form-item>
-        <el-form-item label="毛重,由明细表自动合计生成" prop="fGrossweight">
+        <el-form-item label="毛重(kg),由明细表自动合计生成" prop="fGrossweight">
           <el-input
             v-model="form.fGrossweight"
             placeholder="请输入毛重,由明细表自动合计生成"
           />
         </el-form-item>
-        <el-form-item label="净重,由明细表自动合计生成" prop="fNetweight">
+        <el-form-item label="净重(kg),由明细表自动合计生成" prop="fNetweight">
           <el-input
             v-model="form.fNetweight"
             placeholder="请输入净重,由明细表自动合计生成"
@@ -852,7 +852,7 @@ RK CK DB HZ
           />
         </el-form-item>
         <el-form-item
-          label="计费单位(数据字典),下拉选择毛重或净重"
+          label="计费单位(数据字典),下拉选择毛重(kg)或净重(kg)"
           prop="fFeetunit"
         >
           <el-select

+ 13 - 13
src/views/warehouseBusiness/warehousebillsitems/index.vue

@@ -64,12 +64,12 @@
         <el-input
           v-model="queryParams.fPlanvolumn"
           placeholder="请输入计划尺码"
-          clearable
+          clearablef
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="计划毛重" prop="fPlangrossweight">
+      <el-form-item label="计划毛重(kg)" prop="fPlangrossweight">
         <el-input
           v-model="queryParams.fPlangrossweight"
           placeholder="请输入计划毛重"
@@ -78,7 +78,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="计划净重" prop="fPlannetweight">
+      <el-form-item label="计划净重(kg)" prop="fPlannetweight">
         <el-input
           v-model="queryParams.fPlannetweight"
           placeholder="请输入计划净重"
@@ -96,7 +96,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="毛重" prop="fGrossweight">
+      <el-form-item label="毛重(kg)" prop="fGrossweight">
         <el-input
           v-model="queryParams.fGrossweight"
           placeholder="请输入毛重"
@@ -114,7 +114,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="净重" prop="fNetweight">
+      <el-form-item label="净重(kg)" prop="fNetweight">
         <el-input
           v-model="queryParams.fNetweight"
           placeholder="请输入净重"
@@ -210,12 +210,12 @@
       <el-table-column label="箱型,20GP 4OGP" align="center" prop="fCntrtype" />
       <el-table-column label="计划件数" align="center" prop="fPlanqty" />
       <el-table-column label="计划尺码" align="center" prop="fPlanvolumn" />
-      <el-table-column label="计划毛重" align="center" prop="fPlangrossweight" />
-      <el-table-column label="计划净重" align="center" prop="fPlannetweight" />
+      <el-table-column label="计划毛重(kg)" align="center" prop="fPlangrossweight" />
+      <el-table-column label="计划净重(kg)" align="center" prop="fPlannetweight" />
       <el-table-column label="件数" align="center" prop="fQty" />
-      <el-table-column label="毛重" align="center" prop="fGrossweight" />
+      <el-table-column label="毛重(kg)" align="center" prop="fGrossweight" />
       <el-table-column label="尺码" align="center" prop="fVolumn" />
-      <el-table-column label="净重" align="center" prop="fNetweight" />
+      <el-table-column label="净重(kg)" align="center" prop="fNetweight" />
       <el-table-column label="箱号" align="center" prop="fCntrno" />
       <el-table-column label="车号" align="center" prop="fTruckno" />
       <el-table-column label="状态,N 入" align="center" prop="fBillstatus" />
@@ -289,22 +289,22 @@
         <el-form-item label="计划尺码" prop="fPlanvolumn">
           <el-input v-model="form.fPlanvolumn" placeholder="请输入计划尺码" />
         </el-form-item>
-        <el-form-item label="计划毛重" prop="fPlangrossweight">
+        <el-form-item label="计划毛重(kg)" prop="fPlangrossweight">
           <el-input v-model="form.fPlangrossweight" placeholder="请输入计划毛重" />
         </el-form-item>
-        <el-form-item label="计划净重" prop="fPlannetweight">
+        <el-form-item label="计划净重(kg)" prop="fPlannetweight">
           <el-input v-model="form.fPlannetweight" placeholder="请输入计划净重" />
         </el-form-item>
         <el-form-item label="件数" prop="fQty">
           <el-input v-model="form.fQty" placeholder="请输入件数" />
         </el-form-item>
-        <el-form-item label="毛重" prop="fGrossweight">
+        <el-form-item label="毛重(kg)" prop="fGrossweight">
           <el-input v-model="form.fGrossweight" placeholder="请输入毛重" />
         </el-form-item>
         <el-form-item label="尺码" prop="fVolumn">
           <el-input v-model="form.fVolumn" placeholder="请输入尺码" />
         </el-form-item>
-        <el-form-item label="净重" prop="fNetweight">
+        <el-form-item label="净重(kg)" prop="fNetweight">
           <el-input v-model="form.fNetweight" placeholder="请输入净重" />
         </el-form-item>
         <el-form-item label="箱号" prop="fCntrno">