Merge branch 'master' of git.echepei.com:zhujiawei/Warehouse_management_ui

src/views/agreement/agreementTask/index.vue

@@ -150,7 +150,7 @@
     </el-row>
     <el-table v-loading="loading" :data="agreementList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="客户名称" align="center" prop="fCorpid" show-overflow-tooltip/>
+      <el-table-column label="客户名称" align="center" prop="fCorpid" width="220"/>
       <el-table-column label="协议编号" align="center" prop="fContractno" show-overflow-tooltip/>
 <!--      <el-table-column label="费用名称" align="center" prop="fFeeid"/>-->
       <el-table-column label="有效期起" align="center" prop="fBegindate" width="180">

src/views/finance/charge/index.vue

@@ -107,10 +107,10 @@
     </el-row>
 
     <el-table v-loading="loading" :data="chargeList" @selection-change="handleSelectionChange" show-summary :summary-method="listTotal">
-      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column type="selection" width="60" align="center"/>
       <el-table-column label="序号" type="index" width="55" align="center"/>
       <el-table-column label="系统编号" :show-overflow-tooltip="true" align="center" prop="fBillno" width="120"/>
-      <el-table-column label="货权方" :show-overflow-tooltip="true" align="center" prop="fCtrlcorpid" width="120"/>
+      <el-table-column label="货权方" :show-overflow-tooltip="true" align="center" prop="fCtrlcorpid" width="220"/>
       <!--      <el-table-column label="账单日期" align="center" prop="fAccbilldate" width="180">-->
       <!--        <template slot-scope="scope">-->
       <!--          <span>{{ parseTime(scope.row.fAccbilldate, '{y}-{m}-{d}') }}</span>-->
@@ -119,7 +119,7 @@
       <!--      <el-table-column label="制单部门" align="center" prop="fId"/>-->
       <!--      <el-table-column label="结算单位" align="center" prop="fCorpid"/>-->
       <el-table-column label="对账日期" align="center" prop="fAccbilldate" width="120"/>
-      <el-table-column label="提单号" align="center" prop="tMblno" width="120"/>
+      <el-table-column label="提单号" align="center" prop="tMblno" width="216"/>
       <el-table-column label="应收合计" align="center" prop="fAmtdr" width="120"/>
       <el-table-column label="实收合计" align="center" prop="fAmtcr" width="120"/>
       <el-table-column label="未收金额" align="center" prop="" width="120"/>

src/views/finance/contrast/index.vue

@@ -127,18 +127,18 @@
       show-summary
       :summary-method="listTotal"
     >
-      <el-table-column width="50" align="center" type="selection"/>
+      <el-table-column width="60" align="center" type="selection"/>
       <!-- <el-table-column label="制单部门" align="center" prop="fId" /> -->
       <el-table-column label="行号" align="center" type="index"/>
       <el-table-column label="系统编号" align="center" prop="fBillno" show-overflow-tooltip width="120"/>
-      <el-table-column label="货权方" align="center" show-overflow-tooltip prop="fCtrlcorpid" width="120"/>
-      <el-table-column label="结算单位" align="center" prop="fCorpidName" show-overflow-tooltip width="120"/>
+      <el-table-column label="货权方" align="center" show-overflow-tooltip prop="fCtrlcorpid" width="220"/>
+      <el-table-column label="结算单位" align="center" prop="fCorpidName" show-overflow-tooltip width="220"/>
       <el-table-column label="账单日期" align="center" prop="fAccbilldate" width="120">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.fAccbilldate, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="提单号" align="center" prop="tMblno" width="120"/>
+      <el-table-column label="提单号" align="center" prop="tMblno" width="216"/>
       <el-table-column label="金额" align="center" prop="fAmtdr" width="120"/>
       <el-table-column label="对账金额" align="center" prop="fAmtcr" width="120"/>
       <!--       <el-table-column label="单据类型" align="center" prop="fBilltype" />-->

src/views/finance/payment/index.vue

@@ -107,10 +107,10 @@
     </el-row>
 
     <el-table v-loading="loading" :data="chargeList" @selection-change="handleSelectionChange" show-summary :summary-method="listTotal">
-      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column type="selection" width="60" align="center"/>
       <el-table-column label="序号" type="index" width="55" align="center"/>
       <el-table-column label="系统编号" :show-overflow-tooltip="true" align="center" prop="fBillno" width="120"/>
-      <el-table-column label="货权方" :show-overflow-tooltip="true" align="center" prop="fCtrlcorpid" width="120"/>
+      <el-table-column label="货权方" :show-overflow-tooltip="true" align="center" prop="fCtrlcorpid" width="220"/>
       <!--      <el-table-column label="账单日期" align="center" prop="fAccbilldate" width="180">-->
       <!--        <template slot-scope="scope">-->
       <!--          <span>{{ parseTime(scope.row.fAccbilldate, '{y}-{m}-{d}') }}</span>-->
@@ -119,7 +119,7 @@
       <!--      <el-table-column label="制单部门" align="center" prop="fId"/>-->
       <!--      <el-table-column label="结算单位" align="center" prop="fCorpid"/>-->
       <el-table-column label="对账日期" align="center" prop="fAccbilldate" width="120"/>
-      <el-table-column label="提单号" align="center" prop="tMblno" width="120"/>
+      <el-table-column label="提单号" align="center" prop="tMblno" width="216"/>
       <el-table-column label="应付合计" align="center" prop="fAmtdr" width="120"/>
       <el-table-column label="实付合计" align="center" prop="fAmtcr" width="120"/>
       <el-table-column label="未付金额" align="center" prop="" width="120"/>

src/views/fleet/plans/AddOrUpdate.vue

@@ -17,7 +17,7 @@
                 filterable
                 :disabled="disabled"
                 size="mini"
-                style="width:180px"
+                style="width: 180px"
               >
                 <el-option
                   v-for="(dict, index) in fMblnoOptions"
@@ -34,8 +34,8 @@
                 v-model="form.billType"
                 placeholder="请选择业务类型"
                 :disabled="disabled"
-                 size="mini"
-                 style="width:180px"
+                size="mini"
+                style="width: 180px"
               >
                 <el-option
                   v-for="(dict, index) in billTypeList"
@@ -52,8 +52,8 @@
                 v-model="form.transType"
                 placeholder="请选择运输方式"
                 :disabled="disabled"
-                 size="mini"
-                 style="width:180px"
+                size="mini"
+                style="width: 180px"
               >
                 <el-option
                   v-for="(dict, index) in transTypeList"
@@ -70,8 +70,8 @@
                 v-model="form.transProp"
                 placeholder="请选择运输方式"
                 :disabled="disabled"
-                 size="mini"
-                 style="width:180px"
+                size="mini"
+                style="width: 180px"
               >
                 <el-option
                   v-for="(dict, index) in transPropList"
@@ -90,8 +90,8 @@
                 v-model="form.mblno"
                 placeholder="请输入提单号"
                 :disabled="disabled"
-                 size="mini"
-                 style="width:180px"
+                size="mini"
+                style="width: 180px"
               />
             </el-form-item>
           </el-col>
@@ -103,8 +103,8 @@
                 :disabled="disabled"
                 clearable
                 filterable
-                 size="mini"
-                 style="width:180px"
+                size="mini"
+                style="width: 180px"
               >
                 <el-option
                   v-for="(dict, index) in goodsOptions"
@@ -122,8 +122,8 @@
                 placeholder="请输入计划件数"
                 :disabled="disabled"
                 v-input-limit="2"
-                 size="mini"
-                 style="width:180px"
+                size="mini"
+                style="width: 180px"
               />
             </el-form-item>
           </el-col>
@@ -134,8 +134,8 @@
                 placeholder="请输入计划重量"
                 :disabled="disabled"
                 v-input-limit="2"
-                 size="mini"
-                 style="width:180px"
+                size="mini"
+                style="width: 180px"
               />
             </el-form-item>
           </el-col>
@@ -147,8 +147,8 @@
                 v-model="form.ysl"
                 placeholder="请输入船名"
                 :disabled="disabled"
-                 size="mini"
-                 style="width:180px"
+                size="mini"
+                style="width: 180px"
               />
             </el-form-item>
           </el-col>
@@ -158,8 +158,8 @@
                 v-model="form.voy"
                 placeholder="请输入航次"
                 :disabled="disabled"
-                 size="mini"
-                 style="width:180px"
+                size="mini"
+                style="width: 180px"
               />
             </el-form-item>
           </el-col>
@@ -169,8 +169,8 @@
                 v-model="form.pol"
                 placeholder="请输入起运港"
                 :disabled="disabled"
-                 size="mini"
-                 style="width:180px"
+                size="mini"
+                style="width: 180px"
               />
             </el-form-item>
           </el-col>
@@ -180,8 +180,8 @@
                 v-model="form.pod"
                 placeholder="请输入目的港"
                 :disabled="disabled"
-                 size="mini"
-                 style="width:180px"
+                size="mini"
+                style="width: 180px"
               />
             </el-form-item>
           </el-col>
@@ -197,8 +197,8 @@
                 v-model="form.loadAddr"
                 placeholder="请输入提箱地点"
                 :disabled="disabled"
-                 size="mini"
-                 style="width:180px"
+                size="mini"
+                style="width: 180px"
               />
             </el-form-item>
             <el-form-item v-else label="装货地点" prop="loadAddr">
@@ -206,7 +206,7 @@
                 v-model="form.loadAddr"
                 placeholder="请输入装货地点"
                 :disabled="disabled"
-                 size="mini"
+                size="mini"
               />
             </el-form-item>
           </el-col>
@@ -231,8 +231,8 @@
                 v-model="form.loadAttn"
                 placeholder="请输入装车联系人"
                 :disabled="disabled"
-                 size="mini"
-                 style="width:180px"
+                size="mini"
+                style="width: 180px"
               />
             </el-form-item>
           </el-col>
@@ -243,8 +243,8 @@
                 placeholder="请输入装车联系电话"
                 :disabled="disabled"
                 v-input-limit="0"
-                 size="mini"
-                 style="width:180px"
+                size="mini"
+                style="width: 180px"
               />
             </el-form-item>
           </el-col>
@@ -260,8 +260,8 @@
                 v-model="form.mdLoadAddr"
                 placeholder="请输入装卸货地点"
                 :disabled="disabled"
-                 size="mini"
-                 style="width:180px"
+                size="mini"
+                style="width: 180px"
               />
             </el-form-item>
             <el-form-item
@@ -273,8 +273,8 @@
                 v-model="form.mdLoadAddr"
                 placeholder="请输入装货地点"
                 :disabled="disabled"
-                 size="mini"
-                 style="width:180px"
+                size="mini"
+                style="width: 180px"
               />
             </el-form-item>
           </el-col>
@@ -299,8 +299,8 @@
                 v-model="form.mdLoadAttn"
                 placeholder="请输入装卸货联系人"
                 :disabled="disabled"
-                 size="mini"
-                 style="width:180px"
+                size="mini"
+                style="width: 180px"
               />
             </el-form-item>
           </el-col>
@@ -311,8 +311,8 @@
                 placeholder="请输入装卸货联系电话"
                 :disabled="disabled"
                 v-input-limit="0"
-                 size="mini"
-                 style="width:180px"
+                size="mini"
+                style="width: 180px"
               />
             </el-form-item>
           </el-col>
@@ -324,8 +324,8 @@
                 v-model="form.unLoadAddr"
                 placeholder="请输入卸箱地点"
                 :disabled="disabled"
-                 size="mini"
-                 style="width:180px"
+                size="mini"
+                style="width: 180px"
               />
             </el-form-item>
           </el-col>
@@ -335,8 +335,8 @@
                 v-model="form.unLoadAddr"
                 placeholder="请输入卸箱地点"
                 :disabled="disabled"
-                 size="mini"
-                 style="width:180px"
+                size="mini"
+                style="width: 180px"
               />
             </el-form-item>
           </el-col>
@@ -361,8 +361,8 @@
                 v-model="form.unLoadAttn"
                 placeholder="请输入卸车联系人"
                 :disabled="disabled"
-                 size="mini"
-                 style="width:180px"
+                size="mini"
+                style="width: 180px"
               />
             </el-form-item>
           </el-col>
@@ -373,8 +373,8 @@
                 placeholder="请输入卸车联系电话"
                 :disabled="disabled"
                 v-input-limit="0"
-                 size="mini"
-                 style="width:180px"
+                size="mini"
+                style="width: 180px"
               />
             </el-form-item>
           </el-col>
@@ -389,7 +389,6 @@
                 placeholder="请输入线路描述"
                 :disabled="disabled"
                 size="mini"
-                style="width:180px"
               />
             </el-form-item>
           </el-col>
@@ -404,16 +403,15 @@
                 placeholder="请输入备注"
                 :disabled="disabled"
                 size="mini"
-                style="width:180px"
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <div style="display: flex; justify-content: flex-end; margin: 10px 0">
+        <!-- <div style="display: flex; justify-content: flex-end; margin: 10px 0">
           <el-button type="danger" @click="submitAllowChanges"
             >申请修改</el-button
           >
-        </div>
+        </div> -->
         <el-collapse v-model="collapses">
           <el-collapse-item>
             <template slot="title">
@@ -769,6 +767,7 @@
                       placeholder="费用名称"
                       clearable
                       filterable
+                      :disabled="disabled"
                     >
                       <el-option
                         v-for="(dict, index) in fWbuOptions"
@@ -782,21 +781,15 @@
                 <el-table-column
                   label="计费单位"
                   align="center"
-                  prop="ffeeunitid"
+                  prop="fFeeunitid"
                 >
                   <template slot-scope="scope">
-                    <el-select
-                      v-model="scope.row.ffeeunitid"
+                    <el-input
+                      v-model="scope.row.fFeeunitid"
                       placeholder="计费单位"
+                      v-input-limit="0"
                       :disabled="disabled"
-                    >
-                      <el-option
-                        v-for="(dict, index) in priceTypeList"
-                        :key="index.dictValue"
-                        :label="dict.dictLabel"
-                        :value="dict.dictValue"
-                      />
-                    </el-select>
+                    />
                   </template>
                 </el-table-column>
                 <el-table-column label="计费数量" align="center" prop="fqty">
@@ -805,6 +798,7 @@
                       v-model="scope.row.fqty"
                       placeholder="计费数量"
                       v-input-limit="0"
+                      :disabled="disabled"
                     />
                   </template>
                 </el-table-column>
@@ -814,23 +808,17 @@
                       v-model="scope.row.funitprice"
                       placeholder="单价"
                       v-input-limit="2"
+                      :disabled="disabled"
                     />
                   </template>
                 </el-table-column>
                 <el-table-column label="币种" align="center" prop="fcurrency">
                   <template slot-scope="scope">
-                    <el-select
+                    <el-input
                       v-model="scope.row.fcurrency"
-                      placeholder="请选择币种"
-                    >
-                      <el-option
-                        v-for="item in currencyList"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"
-                      >
-                      </el-option>
-                    </el-select>
+                      placeholder="RMB"
+                      :disabled="true"
+                    />
                   </template>
                 </el-table-column>
                 <el-table-column label="税率" align="center" prop="ftaxrate">
@@ -839,6 +827,7 @@
                       v-model="scope.row.ftaxrate"
                       placeholder="税率"
                       v-input-limit="2"
+                      :disabled="disabled"
                     />
                   </template>
                 </el-table-column>
@@ -848,6 +837,7 @@
                       v-model="scope.row.famount"
                       placeholder="金额"
                       v-input-limit="2"
+                      :disabled="disabled"
                     />
                   </template>
                 </el-table-column>
@@ -857,12 +847,17 @@
                       v-model="scope.row.fexrate"
                       placeholder="汇率"
                       v-input-limit="2"
+                      :disabled="disabled"
                     />
                   </template>
                 </el-table-column>
                 <el-table-column label="备注" align="center" prop="remark">
                   <template slot-scope="scope">
-                    <el-input v-model="scope.row.remark" placeholder="备注" />
+                    <el-input
+                      v-model="scope.row.remark"
+                      placeholder="备注"
+                      :disabled="disabled"
+                    />
                   </template>
                 </el-table-column>
 
@@ -941,6 +936,7 @@
                       placeholder="费用名称"
                       clearable
                       filterable
+                      :disabled="disabled"
                     >
                       <el-option
                         v-for="(dict, index) in fWbuOptions"
@@ -954,12 +950,14 @@
                 <el-table-column
                   label="计费单位"
                   align="center"
-                  prop="ffeeunitid"
+                  prop="fFeeunitid"
                 >
                   <template slot-scope="scope">
                     <el-input
-                      v-model="scope.row.ffeeunitid"
+                      v-model="scope.row.fFeeunitid"
                       placeholder="计费单位"
+                      v-input-limit="0"
+                      :disabled="disabled"
                     />
                   </template>
                 </el-table-column>
@@ -969,6 +967,7 @@
                       v-model="scope.row.fqty"
                       placeholder="计费数量"
                       v-input-limit="0"
+                      :disabled="disabled"
                     />
                   </template>
                 </el-table-column>
@@ -978,23 +977,17 @@
                       v-model="scope.row.funitprice"
                       placeholder="单价"
                       v-input-limit="2"
+                      :disabled="disabled"
                     />
                   </template>
                 </el-table-column>
                 <el-table-column label="币种" align="center" prop="fcurrency">
                   <template slot-scope="scope">
-                    <el-select
+                    <el-input
                       v-model="scope.row.fcurrency"
-                      placeholder="请选择币种"
-                    >
-                      <el-option
-                        v-for="item in currencyList"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"
-                      >
-                      </el-option>
-                    </el-select>
+                      placeholder="RMB"
+                      :disabled="true"
+                    />
                   </template>
                 </el-table-column>
                 <el-table-column label="税率" align="center" prop="ftaxrate">
@@ -1003,6 +996,7 @@
                       v-model="scope.row.ftaxrate"
                       placeholder="税率"
                       v-input-limit="2"
+                      :disabled="disabled"
                     />
                   </template>
                 </el-table-column>
@@ -1012,6 +1006,7 @@
                       v-model="scope.row.famount"
                       placeholder="金额"
                       v-input-limit="2"
+                      :disabled="disabled"
                     />
                   </template>
                 </el-table-column>
@@ -1021,12 +1016,17 @@
                       v-model="scope.row.fexrate"
                       placeholder="汇率"
                       v-input-limit="2"
+                      :disabled="disabled"
                     />
                   </template>
                 </el-table-column>
                 <el-table-column label="备注" align="center" prop="remark">
                   <template slot-scope="scope">
-                    <el-input v-model="scope.row.remark" placeholder="备注" />
+                    <el-input
+                      v-model="scope.row.remark"
+                      placeholder="备注"
+                      :disabled="disabled"
+                    />
                   </template>
                 </el-table-column>
 
@@ -1078,14 +1078,13 @@
                   >
                 </div>
               </div>
-              {{schedulingList}}
               <el-table :data="schedulingList" v-if="userType == '00'">
                 <el-table-column label="箱型" align="center" prop="cntrId">
                   <template slot-scope="scope">
                     <el-select
                       v-model="scope.row.cntrId"
                       placeholder="请选择箱型"
-                      :disabled="disabled||scope.row.billStatus==6"
+                      :disabled="disabled || scope.row.billStatus == 6"
                       @change="checkPid(scope.row)"
                     >
                       <el-option
@@ -1107,7 +1106,7 @@
                     <el-input
                       v-model="scope.row.carcorPid"
                       placeholder="车队名称"
-                      :disabled="disabled||scope.row.billStatus==6"
+                      :disabled="disabled || scope.row.billStatus == 6"
                     />
                   </template>
                 </el-table-column>
@@ -1123,7 +1122,7 @@
                       v-model="scope.row.cntrQty"
                       placeholder="调度安排货量"
                       v-input-limit="2"
-                      :disabled="disabled||scope.row.billStatus==6"
+                      :disabled="disabled || scope.row.billStatus == 6"
                     />
                   </template>
                 </el-table-column>
@@ -1145,7 +1144,7 @@
                     <el-input
                       v-model="scope.row.remarks"
                       placeholder="备注"
-                      :disabled="disabled||scope.row.billStatus==6"
+                      :disabled="disabled || scope.row.billStatus == 6"
                     />
                   </template>
                 </el-table-column>
@@ -1164,7 +1163,7 @@
                       @click.native.prevent="
                         delplansRow(scope.$index, schedulingList, scope.row)
                       "
-                      :disabled="disabled||scope.row.billStatus==6"
+                      :disabled="disabled || scope.row.billStatus == 6"
                       >删除</el-button
                     >
                     <el-button
@@ -1172,7 +1171,7 @@
                       type="text"
                       icon="el-icon-document-checked"
                       @click.native.prevent="addplansRow(scope.row)"
-                      :disabled="disabled||scope.row.billStatus==6"
+                      :disabled="disabled || scope.row.billStatus == 6"
                       >提交</el-button
                     >
                     <el-button
@@ -1197,7 +1196,8 @@
       <el-button type="primary" @click="submitForm" :disabled="disabled"
         >提交</el-button
       >
-      <el-button type="success" @click="submitFix">修改</el-button>
+      <!-- <el-button type="success" @click="submitFix">修改</el-button> -->
+      <el-button type="success" @click="submitAllowChanges">修改</el-button>
       <el-button type="info" @click="submitSave" :disabled="disabled"
         >保 存</el-button
       >
@@ -1366,10 +1366,10 @@ export default {
   },
   methods: {
     //选中时赋值pid
-    checkPid(row){
-        let arr = this.planList;
-        let arr2 = arr.filter((e) => e.cntrId == row.cntrId);
-        row["pid"] = arr2[0].id;
+    checkPid(row) {
+      let arr = this.planList;
+      let arr2 = arr.filter((e) => e.cntrId == row.cntrId);
+      row["pid"] = arr2[0].id;
     },
     noMorecntrId(e) {
       this.cntrIdList.forEach((item) => (item.noOption = false));
@@ -1430,7 +1430,7 @@ export default {
       // 子组件调用父组件方法，并传递参数
       this.$emit("changeShow", "false");
       this.cntrIdList.forEach((item) => (item.noOption = false));
-      // this.fMblnoOptions = [];
+      this.collapses = [];
     },
     /** 提交按钮 */
     submitForm() {
@@ -1442,9 +1442,15 @@ export default {
             this.DList.map((e) => {
               return (e.fDc = "D");
             });
+            this.DList.map((e) => {
+              return (e.fcurrency = "RMB");
+            });
             this.CList.map((e) => {
               return (e.fDc = "C");
             });
+            this.CList.map((e) => {
+              return (e.fcurrency = "RMB");
+            });
             let formData = new window.FormData();
             formData.append("tmsorder", JSON.stringify(this.form));
             formData.append(
@@ -1476,9 +1482,15 @@ export default {
             this.DList.map((e) => {
               return (e.fDc = "D");
             });
+            this.DList.map((e) => {
+              return (e.fcurrency = "RMB");
+            });
             this.CList.map((e) => {
               return (e.fDc = "C");
             });
+            this.CList.map((e) => {
+              return (e.fcurrency = "RMB");
+            });
             let formData = new window.FormData();
             formData.append("tmsorder", JSON.stringify(this.form));
             formData.append(
@@ -1503,11 +1515,23 @@ export default {
     //保存
     submitSave() {
       this.form["billStatus"] = "2";
+      this.DList.map((e) => {
+        return (e.fDc = "D");
+      });
+      this.DList.map((e) => {
+        return (e.fcurrency = "RMB");
+      });
+      this.CList.map((e) => {
+        return (e.fDc = "C");
+      });
+      this.CList.map((e) => {
+        return (e.fcurrency = "RMB");
+      });
       let formData = new window.FormData();
       formData.append("tmsorder", JSON.stringify(this.form));
       formData.append("attachs", JSON.stringify(this.relevantAttachments));
       formData.append("scntrs", JSON.stringify(this.planList));
-      formData.append("fees", JSON.stringify(this.DList));
+      formData.append("fees", JSON.stringify(this.DList.concat(this.CList)));
       formData.append("plans", JSON.stringify(this.schedulingList));
       addFtmsorderbills(formData).then((response) => {
         if (response.code == 200) {
@@ -1521,9 +1545,11 @@ export default {
     submitRetreat() {
       const id = { id: this.form.id };
       RetreatFtmsorderbills(id).then((response) => {
-        this.msgSuccess("撤回成功");
-        this.$parent.getList();
-        this.showDialog = false;
+        if (response.code == 200) {
+          this.msgSuccess("撤回成功");
+          this.$parent.getList();
+          this.$emit("fixDisabled", "false");
+        }
       });
     },
     //修改
@@ -1535,6 +1561,7 @@ export default {
             this.msgSuccess("不允许修改");
           } else {
             this.$emit("fixDisabled", "false");
+            this.msgSuccess("允许修改");
           }
         });
       } else {
@@ -1581,8 +1608,8 @@ export default {
           this.msgSuccess("成功提交");
           if (response.code == 200) {
             // row["billStatus"] = response.data.billStatus;
-            this.$set(row, 'id', response.data.id)
-            this.$set(row, 'billStatus', response.data.billStatus)
+            this.$set(row, "id", response.data.id);
+            this.$set(row, "billStatus", response.data.billStatus);
           }
         });
       } else {
@@ -1590,8 +1617,7 @@ export default {
       }
     },
     delplansRow(index, rows, row) {
-
-      if (row.billStatus != 6&&row.id!=null) {
+      if (row.billStatus != 6 && row.id != null) {
         removeFtmsorderbillsplans(row).then((response) => {
           if (response.code == 200) {
             rows.splice(index, 1);
@@ -1607,10 +1633,10 @@ export default {
         revokeFtmsorderbillsplans(row).then((response) => {
           if (response.code == 200) {
             this.msgSuccess("成功撤回");
-            this.$set(row, 'billStatus', response.data.billStatus)
+            this.$set(row, "billStatus", response.data.billStatus);
           }
         });
-      }else{
+      } else {
         this.msgSuccess("此条数据没有提交，不能申请撤回");
       }
     },

src/views/fleet/plans/index.vue

@@ -126,6 +126,7 @@
           icon="el-icon-search"
           size="mini"
           @click="handleQuery"
+          style="margin-left:30px"
           >搜索</el-button
         >
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
@@ -149,7 +150,7 @@
           type="success"
           icon="el-icon-edit"
           size="mini"
-          :disabled="single"
+          :disabled="true"
           @click="handleUpdate"
           v-hasPermi="['fleet:plans:edit']"
           >修改</el-button

src/views/reportManagement/Statistics/index.vue

@@ -131,16 +131,16 @@
 	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="whgenlegList">
+    <el-table v-loading="loading" :data="whgenlegList" show-summary :summary-method="getSum">
       <!-- <el-table-column type="selection" width="55" align="center" /> -->
       <el-table-column type="index" label="行号" align="center" />
-      <el-table-column label="客户" align="center" prop="fName" show-overflow-tooltip width="120"/>
+      <el-table-column label="客户" align="center" prop="fName" width="220"/>
       <el-table-column label="入库日期" align="center" prop="fBsdate" width="120">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.fBsdate, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="提单号" align="center" prop="fMblno" show-overflow-tooltip width="120"/>
+      <el-table-column label="提单号" align="center" prop="fMblno" show-overflow-tooltip width="216"/>
       <el-table-column label="货物属性" align="center" prop="fBusinessTypes" width="120"/>
       <el-table-column label="属性详情" align="center" prop="fMarks" width="120"/>
       <el-table-column label="品名" align="center" prop="fGoodsName" width="120"/>
@@ -369,6 +369,32 @@ export default {
     })
   },
   methods: {
+    //合计
+    getSum(param){
+      const { columns, data } = param
+      const sums = []
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '总计'
+        } else if (index ===9 || index ===10 || index ===11 ) {
+          const values = data.map(item => Number(item[column.property]))
+          if (!values.every(value => isNaN(value))) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr)
+              if (!isNaN(value)) {
+                return prev + curr
+              } else {
+                return prev
+              }
+            }, 0)
+            if(index ===10 || index ===11){
+              sums[index] = (sums[index]/1000).toFixed(2) + '吨'
+            }
+          }
+        }
+      })
+      return sums
+    },
     treeseLect(tree){
       this.queryParams.fWarehouseid = tree.id
     },

src/views/reportManagement/generalLedgerCr/index.vue

@@ -135,9 +135,9 @@
     <el-table v-loading="loading" :data="payableList" show-summary :summary-method="getSum">
       <!-- <el-table-column type="selection" width="55" align="center" /> -->
       <el-table-column type="index" label="行号" align="center" />
-      <el-table-column label="货权方" align="center" prop="fName" show-overflow-tooltip/>
-      <el-table-column label="结算单位" align="center" prop="fFeesName" show-overflow-tooltip/>
-      <el-table-column label="提单号" align="center" prop="fMblno" show-overflow-tooltip/>
+      <el-table-column label="货权方" align="center" prop="fName" width="220"/>
+      <el-table-column label="结算单位" align="center" prop="fFeesName" width="220"/>
+      <el-table-column label="提单号" align="center" prop="fMblno" show-overflow-tooltip width="216"/>
       <el-table-column label="货物名称" align="center" prop="fProductName" show-overflow-tooltip/>
       <el-table-column label="品牌" align="center" prop="fMarks" />
       <el-table-column label="审核日期" align="center" prop="fReviewDate" width="120">

src/views/reportManagement/generalLedgerDr/index.vue

@@ -134,9 +134,9 @@
     <el-table v-loading="loading" :data="receivableList" show-summary :summary-method="getSum">
       <!-- <el-table-column type="selection" width="55" align="center" /> -->
       <el-table-column type="index" label="行号" align="center" />
-      <el-table-column label="货权方" align="center" prop="fName" show-overflow-tooltip />
-      <el-table-column label="结算单位" align="center" prop="fFeesName" show-overflow-tooltip />
-      <el-table-column label="提单号" align="center" prop="fMblno" show-overflow-tooltip />
+      <el-table-column label="货权方" align="center" prop="fName" width="220"/>
+      <el-table-column label="结算单位" align="center" prop="fFeesName" width="220" />
+      <el-table-column label="提单号" align="center" prop="fMblno" width="216" show-overflow-tooltip />
       <el-table-column label="货物名称" align="center" prop="fProductName" show-overflow-tooltip/>
       <el-table-column label="品牌" align="center" prop="fMarks" width="120"/>
       <el-table-column label="审核日期" align="center" prop="fReviewDate">

src/views/reportManagement/whgenleg/index.vue

@@ -120,21 +120,21 @@
 	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="whgenlegList">
+    <el-table v-loading="loading" :data="whgenlegList" show-summary :summary-method="getSum">
       <!-- <el-table-column type="selection" width="55" align="center" /> -->
-      <el-table-column type="index" label="行号" align="center" width="120"/>
-      <el-table-column label="客户" align="center" prop="fCorpid" show-overflow-tooltip width="120"/>
-      <el-table-column label="入库日期" align="center" prop="fReviewDate" width="120">
+      <el-table-column type="index" label="行号" align="center" width="120" fixed/>
+      <el-table-column label="客户" align="center" prop="fCorpid" fixed width="220"/>
+      <el-table-column label="入库日期" align="center" prop="fReviewDate" fixed width="120">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.fOriginalbilldate , "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="仓储费计算日期" align="center" prop="fChargedate" width="120">
+      <el-table-column label="仓储费计算日期" align="center" prop="fChargedate" fixed width="120">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.fChargedate , "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="提单号" align="center" prop="fMblno" show-overflow-tooltip width="120"/>
+      <el-table-column label="提单号" align="center" fixed prop="fMblno" show-overflow-tooltip width="216"/>
       <el-table-column label="货物属性" align="center" prop="fBusinessTypes" width="120"/>
       <el-table-column label="属性详情" align="center" prop="fMarks" width="120"/>
       <el-table-column label="品名" align="center" prop="fGoodsids" width="120"/>
@@ -346,6 +346,32 @@ export default {
     })
   },
   methods: {
+    //合计
+    getSum(param){
+      const { columns, data } = param
+      const sums = []
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '总计'
+        } else if (index ===13  || index ===10 || index ===11 || index ===12 || index ===14 || index ===15 || index ===16 || index ===17 || index ===18) {
+          const values = data.map(item => Number(item[column.property]))
+          if (!values.every(value => isNaN(value))) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr)
+              if (!isNaN(value)) {
+                return prev + curr
+              } else {
+                return prev
+              }
+            }, 0)
+            if( index ===11 || index ===12 || index ===14 || index ===15 || index ===17 || index ===18){
+              sums[index] = (sums[index]/1000).toFixed(2) + '吨'
+            }
+          }
+        }
+      })
+      return sums
+    },
     treeseLect(tree){
       this.queryParams.fWarehouseLocationid = tree.id
     },
@@ -538,5 +564,12 @@ export default {
         })
     }
   }
-};
+}
 </script>
+<style lang="scss">
+.el-table {
+  .el-table__body-wrapper {
+    z-index: 2;
+  }
+}
+</style>

src/views/warehouseBusiness/agreement/index.vue

@@ -130,7 +130,7 @@
     <el-table v-loading="loading" :data="agreementList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="合同编号" align="center" prop="fContractno" show-overflow-tooltip/>
-      <el-table-column label="客户名称" align="center" prop="fCorpid" show-overflow-tooltip/>
+      <el-table-column label="客户名称" align="center" width="220" prop="fCorpid"/>
       <!--      <el-table-column label="货物品名" align="center" prop="fGoodsid"/>-->
       <el-table-column label="有效期起" align="center" prop="fBegindate" width="180">
         <template slot-scope="scope">

src/views/warehouseBusiness/goodsTransfer/index.vue

@@ -245,17 +245,17 @@
       show-summary :summary-method="getSum"
       @selection-change="handleSelectionChange"
     >
-      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column type="selection" width="60" align="center"/>
       <el-table-column type="index" label="行号" align="center"/>
       <el-table-column  label="制单人" align="center" prop="createBy" />
       <el-table-column
-        width="180"
+        width="220"
         label="货权方"
         align="center"
         prop="fCorpid"
       />
       <el-table-column
-        width="180"
+        width="220"
         label="转货权方"
         align="center"
         prop="fTocorpid"
@@ -2022,7 +2022,7 @@
         columns.forEach((column, index) => {
           if (index === 0) {
             sums[index] = '总计'
-          } else if ( index ===10 || index ===11 || index ===12 ) {
+          } else if ( index ===13 || index ===11 || index ===12 ) {
             const values = data.map(item => Number(item[column.property]))
             if (!values.every(value => isNaN(value))) {
               sums[index] = values.reduce((prev, curr) => {
@@ -2033,6 +2033,9 @@
                   return prev
                 }
               }, 0)
+              if(index ===13 || index ===12){
+                sums[index] = (sums[index]/1000).toFixed(2) + '吨'
+              }
             }
           }
         })
@@ -2999,6 +3002,7 @@
                 this.$set(this.dataList[li], 'fBsdate', Date.parse(this.dataList[li].fBsdate))
                 this.$set(this.dataList[li], 'fBusinessType', this.dataList[li].fBusinessType + '')
               }
+              this.getList()
             })
           }
         })

src/views/warehouseBusiness/inStock/index.vue

@@ -270,7 +270,7 @@
       @selection-change="handleSelectionChange"
       show-summary :summary-method="getSum"
     >
-      <el-table-column type="selection" width="55" fixed align="center" />
+      <el-table-column type="selection" width="60" fixed align="center" />
       <el-table-column type="index" label="行号" align="center" fixed/>
       <el-table-column  label="制单人" align="center" prop="createBy" fixed/>
       <el-table-column
@@ -292,11 +292,11 @@
 
         label="货权方"
         fixed
-        width="180"
+        width="220"
         align="center"
         prop="fCorpid"
       />
-      <el-table-column label="提单号" fixed width="100" align="center" prop="fMblno" show-overflow-tooltip/>
+      <el-table-column label="提单号" fixed width="216" align="center" prop="fMblno" show-overflow-tooltip />
       <el-table-column label="品名" fixed :show-overflow-tooltip="true" align="center" prop="fProductName" />
       <el-table-column label="品牌" fixed align="center" prop="fMarks" />
       <el-table-column
@@ -320,8 +320,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="入库毛重(kg)" align="center" prop="fGrossweight" />
-      <el-table-column label="入库净重(kg)" align="center" prop="fNetweight" />
+      <el-table-column label="入库毛重(kg)" align="center" width="100" prop="fGrossweight" />
+      <el-table-column label="入库净重(kg)" align="center" width="100" 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"/>
@@ -725,7 +725,7 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="15">
+          <el-col :span="14">
             <el-form-item label="备注" prop="remark">
               <el-input
                 style="width: 100%"
@@ -742,11 +742,12 @@
               </el-button>
             </el-form-item>
           </el-col>
-          <el-col :span="5">
+          <el-col :span="8">
             <el-form-item prop="fChargedate">
               <el-date-picker
                 v-model="form.fChargedate"
                 type="date"
+                style="width:80%"
                 :disabled="browseStatus || formBrowseStatus"
                 value-format="timestamp"
                 placeholder="仓储费计算日期"
@@ -2654,7 +2655,7 @@
               class="zzss"
               style="font-size: 28px; font-weight: bold; border: none"
             >
-              青岛途宝进仓单
+              青岛大木进仓单
             </td>
           </tr>
           <tr>
@@ -2677,7 +2678,7 @@
             <td width="450" colspan="3" class="zzss">地址：{{ fAddr }}</td>
           </tr>
           <tr>
-            <td width="200" colspan="2" class="zzss">保管方：途宝有限公司</td>
+            <td width="200" colspan="2" class="zzss">保管方：大木有限公司</td>
             <td width="200" colspan="2" class="zzss">
               联系人：{{ form.fContacts }}
             </td>
@@ -2779,7 +2780,7 @@
               class="zzss"
               style="font-size: 26px; font-weight: bold; border: none"
             >
-              途宝国际物流(青岛)有限公司收货单
+              大木国际物流(青岛)有限公司收货单
             </td>
           </tr>
           <!-- <div v-for="{{}}" :key="index"> -->
@@ -2880,40 +2881,37 @@
               class="zzss"
               style="font-size: 20px; font-weight: bold; border: none"
             >
-              途宝国际物流(青岛)有限公司作业单
+              大木国际物流(青岛)有限公司作业单
             </td>
           </tr>
           <tr>
-            <td
-              width="900"
-              colspan="4"
-              class="zzss"
-              style="font-size: 28px; font-weight: bold;"
-            >
-            </td>
+          <td
+             width="500"
+             colspan="4"
+             style="padding: 6px; font-weight: bold;"
+             class="zzss"
+          >
+              作业类型：{{ businessType }}
+           </td>
+<!--            <td-->
+<!--              width="900"-->
+<!--              colspan="2"-->
+<!--              class="zzss"-->
+<!--              style="font-size: 28px; font-weight: bold;"-->
+<!--            >-->
+<!--            </td>-->
             <td  width="500"v-if="!fBsdates || !fBstime" colspan="2" style="padding-bottom: 0; font-weight: bold;">入库时间：</td>
 
             <td
               v-else
               width="500"
               colspan="2"
-              style="padding-bottom: 0px; font-weight: bold;"
+              style="padding: 6px; font-weight: bold;"
               class="zzss"
             >
               入库日期：{{ fBsdates }} {{ fBstime.slice(11,19) }}
             </td>
           </tr>
-
-<!--          <tr v-for="(item, index) in Printinglist" :key="index">-->
-<!--            <td width="200">车号</td>-->
-<!--            <td width="200">{{ item.fTruckno }}</td>-->
-<!--            <td width="200">货物品名</td>-->
-<!--            <td width="200" class="zzss">-->
-<!--              {{ item.fGoodsids }}-->
-<!--            </td>-->
-<!--            <td width="200">{{item.fBusinessTypes}}</td>-->
-<!--            <td width="200">{{item.fMarks}}</td>-->
-<!--          </tr>-->
           <tr>
             <td width="200">车号</td>
             <td width="200">货物品名</td>
@@ -2965,12 +2963,11 @@
 <!--            <td colspan="6" class="zzss">&nbsp;</td>-->
 <!--          </tr>-->
           <tr>
+            <td width="290" class="zzss" colspan="2">地址：{{ dataListFaddr }}</td>
+            <td width="290" class="zzss" colspan="2">电话：{{ form.fTel }}</td>
             <td width="280" class="zzss"></td>
             <td width="280" class="zzss"></td>
-            <td width="280" class="zzss"></td>
-            <td width="280" class="zzss"></td>
-            <td width="290" class="zzss">地址：{{ dataListFaddr }}</td>
-            <td width="290" class="zzss">电话：{{ form.fTel }}</td>
+
           </tr>
         </table>
         <div>
@@ -3047,6 +3044,7 @@ export default {
   },
   data() {
     return {
+      businessType:'',
       dataListFaddr:'',
       information:'',
       informationId:'',
@@ -3419,7 +3417,7 @@ export default {
       columns.forEach((column, index) => {
         if (index === 0) {
           sums[index] = '总计'
-        } else if (index ===9  || index ===10 || index ===11 || index ===12 ) {
+        } else if (index ===13  || index ===10 || index ===11 || index ===12 ) {
           const values = data.map(item => Number(item[column.property]))
           if (!values.every(value => isNaN(value))) {
             sums[index] = values.reduce((prev, curr) => {
@@ -3430,6 +3428,9 @@ export default {
                 return prev
               }
             }, 0)
+            if(index ===13 || index ===12){
+              sums[index] = (sums[index]/1000).toFixed(2) + '吨'
+            }
           }
         }
       })
@@ -3938,6 +3939,11 @@ export default {
         }
         this.editDialogVisible_sss = true
         this.fBstime = this.form.fBstime
+        for(let item in this.businessTypeOption){
+          if(this.form.fBusinessType == this.businessTypeOption[item].dictValue){
+            this.businessType = this.businessTypeOption[item].dictLabel
+          }
+        }
       } else {
         this.$message.error('请选择需要打印的明细!')
       }

src/views/warehouseBusiness/outStock/index.vue

@@ -255,7 +255,7 @@
       @selection-change="handleSelectionChange"
       show-summary :summary-method="getSum"
     >
-      <el-table-column type="selection" width="55" fixed align="center" />
+      <el-table-column type="selection" width="60" fixed align="center" />
       <el-table-column type="index" label="行号" fixed align="center" />
       <el-table-column  label="制单人" align="center" prop="createBy" fixed/>
       <el-table-column
@@ -274,13 +274,13 @@
       </el-table-column>
 
       <el-table-column
-        width="180"
+        width="220"
         label="货权方"
         fixed
         align="center"
         prop="fCorpid"
       />
-      <el-table-column label="提单号" width="100" align="center" prop="fMblno" fixed show-overflow-tooltip/>
+      <el-table-column label="提单号" width="216" align="center" prop="fMblno" fixed show-overflow-tooltip/>
       <el-table-column label="品名" :show-overflow-tooltip="true" fixed align="ceter" prop="fProductName" />
       <el-table-column label="品牌" align="center" fixed prop="fMarks" />
       <el-table-column
@@ -386,6 +386,7 @@
       :visible.sync="open"
       :close-on-click-modal="false"
       @close='addCloseDialog'
+      :show-close="closeButton"
       width="80%"
       append-to-body
 
@@ -2431,7 +2432,7 @@
               class="zzss"
               style="font-size: 28px; font-weight: bold; border: none"
             >
-              青岛途宝进仓单
+              青岛大木进仓单
             </td>
           </tr>
           <tr>
@@ -2454,7 +2455,7 @@
             <td width="450" colspan="3" class="zzss">地址：{{ fAddr }}</td>
           </tr>
           <tr>
-            <td width="200" colspan="2" class="zzss">保管方：途宝有限公司</td>
+            <td width="200" colspan="2" class="zzss">保管方：大木有限公司</td>
             <td width="200" colspan="2" class="zzss">
               联系人：{{ form.fContacts }}
             </td>
@@ -2560,7 +2561,7 @@
               class="zzss"
               style="font-size: 26px; font-weight: bold; border: none"
             >
-              途宝国际物流(青岛)有限公司收货单
+              大木国际物流(青岛)有限公司收货单
             </td>
           </tr>
           <!-- <div v-for="{{}}" :key="index"> -->
@@ -2648,7 +2649,7 @@
               class="zzss"
               style="font-size: 20px; font-weight: bold; border: none"
             >
-              途宝国际物流(青岛)有限公司作业单
+              大木国际物流(青岛)有限公司作业单
             </td>
           </tr>
           <tr>
@@ -2656,18 +2657,17 @@
               width="900"
               colspan="2"
               class="zzss"
-              style="padding-bottom: 0px; font-weight: bold;"
+              style="padding: 6px; font-weight: bold;"
             >车辆类型：{{ fCartype }}
             </td>
-            <td colspan="2">
-
+            <td colspan="2"  class="zzss" style="padding: 6px; font-weight: bold;">作业类型：{{businessType}}
             </td>
             <td  width="500"v-if="!fBsdate || !fBstime" colspan="2" style="padding-bottom: 0; font-weight: bold;">入库时间：</td>
             <td
               v-else
               width="500"
               colspan="2"
-              style="padding-bottom: 0px; font-weight: bold;"
+              style="padding: 6px; font-weight: bold;"
               class="zzss"
             >
               出库日期：{{ fBsdate }} {{ fBstime.slice(11,19) }}
@@ -2732,12 +2732,11 @@
 <!--            <td colspan="6" class="zzss">&nbsp;</td>-->
 <!--          </tr>-->
           <tr>
+            <td width="290" class="zzss" colspan="2">地址：{{ fAddr }}</td>
+            <td width="290" class="zzss" colspan="2">电话：{{ form.fTel }}</td>
             <td width="280" class="zzss"></td>
             <td width="280" class="zzss"></td>
-            <td width="280" class="zzss"></td>
-            <td width="280" class="zzss"></td>
-            <td width="290" class="zzss">地址：{{ fAddr }}</td>
-            <td width="290" class="zzss">电话：{{ form.fTel }}</td>
+
           </tr>
         </table>
         <div>
@@ -2816,6 +2815,8 @@ export default {
   },
   data() {
     return {
+      closeButton:true,
+      businessType:'',
       fCartype:'',
       fBstime:'',
       browseStatu:false,
@@ -3290,7 +3291,7 @@ export default {
       columns.forEach((column, index) => {
         if (index === 0) {
           sums[index] = '总计'
-        } else if (index ===9  || index ===10 || index ===11 || index ===12 ) {
+        } else if (index ===13  || index ===10 || index ===11 || index ===12 ) {
           const values = data.map(item => Number(item[column.property]))
           if (!values.every(value => isNaN(value))) {
             sums[index] = values.reduce((prev, curr) => {
@@ -3301,6 +3302,9 @@ export default {
                 return prev
               }
             }, 0)
+            if(index ===13 || index ===12){
+              sums[index] = (sums[index]/1000).toFixed(2) + '吨'
+            }
           }
         }
       })
@@ -3985,6 +3989,11 @@ export default {
           this.openPrintJobSheet = true
           this.fBstime = this.form.fBstime
         }, 200);
+        for(let item in this.businessTypeOption){
+          if(this.form.fBusinessType == this.businessTypeOption[item].dictValue){
+            this.businessType = this.businessTypeOption[item].dictLabel
+          }
+        }
       }
     },
     showEditDialog_ss() {

src/views/warehouseBusiness/stockTransfer/index.vue

@@ -256,7 +256,7 @@
       show-summary :summary-method="getSum"
       @selection-change="handleSelectionChange"
     >
-      <el-table-column type="selection" width="55" fixed align="center" />
+      <el-table-column type="selection" width="60" fixed align="center" />
       <el-table-column type="index" label="行号" fixed align="center" />
       <el-table-column  label="制单人" align="center" prop="createBy" fixed/>
       <el-table-column
@@ -275,13 +275,13 @@
       </el-table-column>
 
       <el-table-column
-        width="180"
+        width="220"
         label="货权方"
         fixed
         align="center"
         prop="fCorpid"
       />
-      <el-table-column label="提单号" fixed width="100" align="center" prop="fMblno" show-overflow-tooltip/>
+      <el-table-column label="提单号" fixed width="216" align="center" prop="fMblno" show-overflow-tooltip/>
       <el-table-column label="品名" fixed :show-overflow-tooltip="true" align="ceter" prop="fProductName" />
       <el-table-column label="品牌" fixed align="center" prop="fMarks" />
       <el-table-column
@@ -2295,7 +2295,7 @@
               class="zzss"
               style="font-size: 20px; font-weight: bold; border: none"
             >
-              途宝国际物流(青岛)有限公司作业单
+              大木国际物流(青岛)有限公司作业单
             </td>
           </tr>
           <tr>
@@ -2303,8 +2303,9 @@
               width="900"
               colspan="4"
               class="zzss"
-              style="font-size: 28px; font-weight: bold"
+              style="padding: 6px;font-weight: bold"
             >
+              作业类型：{{businessType}}
             </td>
             <td  width="500"v-if="this.printinglist.length === 0 || !fBstime" colspan="2" style="padding-bottom: 0; font-weight: bold;">入库时间：111</td>
 
@@ -2312,7 +2313,7 @@
               v-else
               width="500"
               colspan="2"
-              style="padding-bottom: 0px; font-weight: bold;"
+              style="padding: 6px; font-weight: bold;"
               class="zzss"
             >
               调拨日期：{{ parseTime(this.printinglist[0].fBsdate,"{y}-{m}-{d}") }} {{ fBstime.slice(11,19) }}
@@ -2376,12 +2377,11 @@
 <!--            <td colspan="6" class="zzss">&nbsp;</td>-->
 <!--          </tr>-->
           <tr>
+            <td width="290" class="zzss" colspan="2">地址：{{ fAddr }}</td>
+            <td width="290" class="zzss" colspan="2">电话：{{ form.fTel }}</td>
             <td width="280" class="zzss"></td>
             <td width="280" class="zzss"></td>
-            <td width="280" class="zzss"></td>
-            <td width="280" class="zzss"></td>
-            <td width="290" class="zzss">地址：{{ fAddr }}</td>
-            <td width="290" class="zzss">电话：{{ form.fTel }}</td>
+
           </tr>
         </table>
         <div>
@@ -2415,7 +2415,7 @@
             class="zzss"
             style="font-size: 26px; font-weight: bold; border: none"
           >
-            途宝国际物流(青岛)有限公司收货单
+            大木国际物流(青岛)有限公司收货单
           </td>
         </tr>
         <!-- <div v-for="{{}}" :key="index"> -->
@@ -2517,7 +2517,7 @@
             class="zzss"
             style="font-size: 28px; font-weight: bold; border: none"
           >
-            青岛途宝进仓单
+            青岛大木进仓单
           </td>
         </tr>
         <tr>
@@ -2540,7 +2540,7 @@
           <td width="450" colspan="3" class="zzss">地址：{{ fAddr }}</td>
         </tr>
         <tr>
-          <td width="200" colspan="2" class="zzss">保管方：途宝有限公司</td>
+          <td width="200" colspan="2" class="zzss">保管方：大木有限公司</td>
           <td width="200" colspan="2" class="zzss">
             联系人：{{ form.fContacts }}
           </td>
@@ -2692,6 +2692,7 @@ export default {
   },
   data() {
     return {
+      businessType:'',
       fBstime:'',
       fPackagespecs: "",
       editDialogVisible_s: false,
@@ -3003,7 +3004,7 @@ export default {
       columns.forEach((column, index) => {
         if (index === 0) {
           sums[index] = '总计'
-        } else if (index ===13  || index ===10 || index ===11 || index ===12 ) {
+        } else if (index ===13  || index ===14 || index ===11 || index ===12 ) {
           const values = data.map(item => Number(item[column.property]))
           if (!values.every(value => isNaN(value))) {
             sums[index] = values.reduce((prev, curr) => {
@@ -3014,6 +3015,9 @@ export default {
                 return prev
               }
             }, 0)
+            if(index ===13 || index ===14){
+              sums[index] = (sums[index]/1000).toFixed(2) + '吨'
+            }
           }
         }
       })
@@ -3743,6 +3747,11 @@ export default {
         this.openPrintJobSheet = true
         this.fBstime = this.form.fBstime
       }, 200);
+      for(let item in this.businessTypeOption){
+        if(this.form.fBusinessType == this.businessTypeOption[item].dictValue){
+          this.businessType = this.businessTypeOption[item].dictLabel
+        }
+      }
     },
     // 收款信息
     addCollection() {