Merge branch 'dev' of http://git.echepei.com/zhujiawei/Warehouse_management_ui into dev

src/api/basicdata/corps.js

@@ -10,6 +10,15 @@ export function listCorps(query) {
   })
 }
 
+// 查询仓储协议对应的客户详情列表
+export function agreementListCorps(query) {
+  return request({
+    url: '/basicdata/corps/agreementCorpList',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询客户详情详细
 export function getCorps(fId) {
   return request({

src/views/Warehousing/cargoClearance/AddOrUpdate.vue

@@ -792,25 +792,27 @@
                 size="small"
                 type="info"
                 :disabled="browseStatus"
+                v-if="entryPrinting == 0"
                 prop="打印"
                 @click="printZyd"
                 >作业单
               </el-button>
               <el-button
                 size="small"
+                v-if="entryPrinting == 0"
                 :disabled="browseStatus"
                 @click="discharge"
                 >叫车进场</el-button
               >
               <el-button
                 size="small"
-                :disabled="dataListSelection.length <= 0 || browseStatus"
+                :disabled="dataListSelection.length <= 0 || browseStatus || deliveryConfirmation"
                 @click="creditClick"
                 >调拨确认
               </el-button>
               <el-button
                 size="small"
-                :disabled="dataWithdrawList.length <= 0 || browseStatus || form.fBillstatus > 3"
+                :disabled="dataWithdrawList.length <= 0 || browseStatus || form.fBillstatus > 3 || cancelDelivery"
                 @click.prevent="withdrawClick"
                 >撤回调拨
               </el-button>
@@ -3177,6 +3179,9 @@ export default {
       tfNetweightnum: 0,
       tfGrossweightnum: 0,
       showApproval: null,
+      entryPrinting: 1,
+      cancelDelivery: false, //
+      deliveryConfirmation: false, //
     };
   },
   created() {
@@ -3221,6 +3226,9 @@ export default {
         this.detailsHidden2 = true;
       }
     });
+    this.getConfigKey('entry.printing').then((response) => {
+      this.entryPrinting = response.msg
+    })
     listWarehousesss({ fStatus: 0, delFlag: 0 }).then((response) => {
       this.warehouseOptions = response.rows;
     });
@@ -3788,8 +3796,10 @@ export default {
         if (!this.Printinglist[item].fId) {
           return this.$message.error("请存在未保存的数据");
         }
-        if (this.Printinglist[item].fBillstatus == 10) {
-          return this.$message.error("请存在未打印的作业单");
+        if (this.entryPrinting == 0) {
+          if (this.Printinglist[item].fBillstatus == 10) {
+            return this.$message.error("请存在未打印的作业单");
+          }
         }
         if (!this.Printinglist[item].fTruckno) {
           return this.$message.error("车号不能为空");
@@ -4445,13 +4455,38 @@ export default {
     },
     // 库存明细多选
     Selectinventory(selection) {
-      this.Printinglist = selection;
-      //允许确认入库list
-      this.dataListSelection = [];
-      this.dataListSelection = selection.filter((e) => e.fBillstatus == 30);
+      this.Printinglist = selection
       //允许撤销入库list
-      this.dataWithdrawList = [];
-      this.dataWithdrawList = selection.filter((e) => e.fBillstatus == 40);
+      this.dataWithdrawList = selection
+      //允许确认入库list
+      this.dataListSelection = selection
+      if (this.dataWithdrawList.length === 0) {
+        this.cancelDelivery = true
+      } else {
+        for (let item in this.dataWithdrawList) {
+          if (this.dataWithdrawList[item].fBillstatus === 40) {
+            this.cancelDelivery = false
+            this.deliveryConfirmation = true
+            for (let li in this.dataWithdrawList) {
+              if (this.entryPrinting != 0 ? this.dataWithdrawList[li].fBillstatus === 10 : this.dataWithdrawList[li].fBillstatus === 30) {
+                this.deliveryConfirmation = true
+                this.cancelDelivery = true
+                return
+              }
+            }
+          } else if (this.entryPrinting != 0 ? this.dataWithdrawList[item].fBillstatus === 10 : this.dataWithdrawList[item].fBillstatus === 30) {
+            this.deliveryConfirmation = false
+            this.cancelDelivery = true
+            for (let li in this.dataWithdrawList) {
+              if (this.dataWithdrawList[li].fBillstatus === 40) {
+                this.deliveryConfirmation = true
+                this.cancelDelivery = true
+                return
+              }
+            }
+          }
+        }
+      }
     },
     // 合计
     getSummaries(param) {

src/views/Warehousing/inAndOutStock/AddOrUpdate.vue

@@ -3569,9 +3569,9 @@
           <table border="0" cellspacing="0" cellpadding="0" style="width: 100%; line-height: 30px">
             <tr>
               <td>客户名称</td>
-              <td>{{ form.fCorpidName }}</td>
+              <td colspan="3">{{ form.fCorpidName }}</td>
               <td>入库日期</td>
-              <td>{{ form.fBsdate | fBsdateFormat }}</td>
+              <td colspan="2">{{ form.fBsdate | fBsdateFormat }}</td>
               <td>流水号</td>
               <td colspan="3" v-if="form.fBillno">
 <!--                {{ form.fBillno }}-{{ lsTime }}-->
@@ -3581,9 +3581,9 @@
             </tr>
             <tr>
               <td>车号</td>
-              <td>{{ form.fTruckno }}</td>
+              <td colspan="3">{{ form.fTruckno }}</td>
               <td>提单号</td>
-              <td>{{ form.fMblno }}</td>
+              <td colspan="2">{{ form.fMblno }}</td>
               <td>箱号</td>
               <td colspan="3" v-if="Printinglist1.length">
                 {{ Printinglist1[0].fCntrno }}
@@ -3598,27 +3598,30 @@
               <td>净重(吨)</td>
               <td>规格</td>
               <td>区位</td>
+              <td>车号</td>
+              <td>司机名</td>
+              <td>司机电话</td>
               <td>备注</td>
             </tr>
             <tr v-for="(item, index) in Printinglist1" :key="index">
               <td>{{ item.fGoodsids }}</td>
               <td>{{ item.fCntqty }}</td>
               <td>{{ item.fQty }}</td>
-              <td v-if="item.fGrossweight">
-                {{ (item.fGrossweight / 1000).toFixed(4) }}
-              </td>
-              <td v-else></td>
-              <td>{{ (item.fNetweight/1000).toFixed(4)}}</td>
+              <td>{{ (item.fGrossweight? item.fGrossweight: 0 / 1000).toFixed(4) }}</td>
+              <td>{{ (item.fNetweight? item.fNetweight: 0/1000).toFixed(4)}}</td>
               <td>{{ item.fPackagespecs }}</td>
               <td>{{ item.fWarehouseInformation }}</td>
+              <td>{{ item.fTruckno }}</td>
+              <td>{{ item.fDriverName }}</td>
+              <td>{{ item.fDriverTel }}</td>
               <td>{{ item.remark }}</td>
             </tr>
             <tr>
               <td>备注</td>
               <!--              <td colspan="4">不贴标签不卸货</td>-->
-              <td colspan="4">{{ form.remark }}</td>
+              <td colspan="5">{{ form.remark }}</td>
               <td>总件数</td>
-              <td colspan="2">{{ allfQty }}</td>
+              <td colspan="4">{{ allfQty }}</td>
             </tr>
           </table>
         </div>
@@ -7187,6 +7190,9 @@ export default {
               if (e.fQty) {
                 this.allfQty += e.fQty;
               }
+              if (e.fWarehouselocid) {
+                this.$set(e, 'fWarehouseInformation', this.fWarehouseidOptions.find(item => item.id == e.fWarehouselocid).fWarehouseInformation)
+              }
             });
             if (command == "a") {
               this.print_shd = true;

src/views/Warehousing/inStock/AddOrUpdate.vue

@@ -505,6 +505,20 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="8" v-if="showfCustomno">
+            <el-form-item
+              label="备案序号"
+              prop="fEmsSeqNo"
+            >
+              <el-input
+                v-model="form.fEmsSeqNo"
+                style="width: 80%"
+                placeholder="备案序号"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
 
       <el-row>

src/views/Warehousing/outStock/AddOrUpdate.vue

@@ -929,7 +929,7 @@
                   <el-dropdown-item command="q">签收单</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
-              <el-dropdown @command="detailedApproval" style="margin-left: 10px" v-if="showApproval == 0">
+              <el-dropdown @command="detailedApproval" style="margin-left: 10px" v-if="showMXApproval == 0">
                 <el-button size="small" type="primary">
                   明细审批<i class="el-icon-arrow-down el-icon--right"></i>
                 </el-button>
@@ -5695,6 +5695,7 @@ export default {
       tfNetweightnum: 0,
       tfGrossweightnum: 0,
       showApproval: null,
+      showMXApproval: null,
       allfPlanqty: 0,
       ckTime: null,
       entryPrinting: 1,
@@ -6176,6 +6177,9 @@ export default {
     this.getConfigKey('outStock.orders.approvalFlow').then((response) => {
       this.showApproval = response.msg
     })
+    this.getConfigKey('warehouse.outStockItem.ApprovalFlow').then((response) => {
+      this.showMXApproval = response.msg
+    })
     listWarehousesss({ fStatus: 0, delFlag: 0 }).then((response) => {
       this.warehouseOptions = response.rows
     })

src/views/Warehousing/stockTransfer/AddOrUpdate.vue

@@ -798,25 +798,27 @@
               <el-button
                 size="small"
                 type="info"
+                v-if="entryPrinting == 0"
                 prop="打印"
                 @click="printZyd"
                 >作业单
               </el-button>
               <el-button
                 size="small"
+                v-if="entryPrinting == 0"
                 :disabled="browseStatus"
                 @click="discharge"
                 >叫车进场</el-button
               >
               <el-button
                 size="small"
-                :disabled="dataListSelection.length <= 0 || browseStatus"
+                :disabled="dataListSelection.length <= 0 || browseStatus || deliveryConfirmation"
                 @click="creditClick"
                 >调拨确认
               </el-button>
               <el-button
                 size="small"
-                :disabled="dataWithdrawList.length <= 0 || browseStatus || form.fBillstatus > 3"
+                :disabled="dataWithdrawList.length <= 0 || browseStatus || form.fBillstatus > 3 || cancelDelivery"
                 @click.prevent="withdrawClick"
                 >撤回调拨
               </el-button>
@@ -2894,10 +2896,10 @@
             <tr>
               <td colspan="2" style="height: 20px">合 计</td>
               <td>{{allfQty}}</td>
-              <td v-if="radio == 1">{{ (allfNetweight / 1000).toFixed(4) }}</td>
               <td v-if="radio == 1">{{ (allfGrossweight / 1000).toFixed(4) }}</td>
-              <td v-if="radio == 2">{{ allfNetweight }}</td>
+              <td v-if="radio == 1">{{ (allfNetweight / 1000).toFixed(4) }}</td>
               <td v-if="radio == 2">{{ allfGrossweight }}</td>
+              <td v-if="radio == 2">{{ allfNetweight }}</td>
               <td></td>
             </tr>
             <tr>
@@ -2999,10 +3001,10 @@
             <tr>
               <td colspan="2">合计：</td>
               <td>{{allfQty}}</td>
-              <td v-if="radio == 1">{{(allfNetweight/1000).toFixed(4)}}</td>
               <td v-if="radio == 1">{{(allfGrossweight/1000).toFixed(4)}}</td>
-              <td v-if="radio == 2">{{allfNetweight}}</td>
+              <td v-if="radio == 1">{{(allfNetweight/1000).toFixed(4)}}</td>
               <td v-if="radio == 2">{{allfGrossweight}}</td>
+              <td v-if="radio == 2">{{allfNetweight}}</td>
               <td></td>
             </tr>
             <tr>
@@ -4238,6 +4240,7 @@ export default {
       isShowInvoice: null,
       // 是否启用费用确认单
       isShowFeesConfirm: null,
+      entryPrinting: 1,
       // 选择打印抬头中文名
       fCompanyName: '',
       printFeeConfirm: {
@@ -4248,6 +4251,8 @@ export default {
         fTax: '',
       },
       battributionList: [],
+      cancelDelivery: false, //
+      deliveryConfirmation: false, //
     };
   },
   created() {
@@ -4284,6 +4289,9 @@ export default {
       this.fStorageTypeOptions = response.data;
       localStorage.setItem("fStorageTypeList", JSON.stringify(response.data));
     });
+    this.getConfigKey('entry.printing').then((response) => {
+      this.entryPrinting = response.msg
+    })
     this.getConfigKey("data_showcar").then((response) => {
       this.dataShowcar = response.msg;
       if (this.dataShowcar == "0") {
@@ -4908,9 +4916,12 @@ export default {
         if (!this.Printinglist[item].fId) {
           return this.$message.error("请存在未保存的数据");
         }
-        if (this.Printinglist[item].fBillstatus == 10) {
-          return this.$message.error("请存在未打印的作业单");
+        if (this.entryPrinting == 0) {
+          if (this.Printinglist[item].fBillstatus == 10) {
+            return this.$message.error("请存在未打印的作业单");
+          }
         }
+
         // if (!this.Printinglist[item].fTruckno) {
         //   return this.$message.error("车号不能为空");
         // }
@@ -5737,13 +5748,38 @@ export default {
     },
     // 库存明细多选
     Selectinventory(selection) {
-      this.Printinglist = selection;
-      //允许确认入库list
-      this.dataListSelection = [];
-      this.dataListSelection = selection.filter((e) => e.fBillstatus == 30);
+      this.Printinglist = selection
       //允许撤销入库list
-      this.dataWithdrawList = [];
-      this.dataWithdrawList = selection.filter((e) => e.fBillstatus == 40);
+      this.dataWithdrawList = selection
+      //允许确认入库list
+      this.dataListSelection = selection
+      if (this.dataWithdrawList.length === 0) {
+        this.cancelDelivery = true
+      } else {
+        for (let item in this.dataWithdrawList) {
+          if (this.dataWithdrawList[item].fBillstatus === 40) {
+            this.cancelDelivery = false
+            this.deliveryConfirmation = true
+            for (let li in this.dataWithdrawList) {
+              if (this.entryPrinting != 0 ? this.dataWithdrawList[li].fBillstatus === 10 : this.dataWithdrawList[li].fBillstatus === 30) {
+                this.deliveryConfirmation = true
+                this.cancelDelivery = true
+                return
+              }
+            }
+          } else if (this.entryPrinting != 0 ? this.dataWithdrawList[item].fBillstatus === 10 : this.dataWithdrawList[item].fBillstatus === 30) {
+            this.deliveryConfirmation = false
+            this.cancelDelivery = true
+            for (let li in this.dataWithdrawList) {
+              if (this.dataWithdrawList[li].fBillstatus === 40) {
+                this.deliveryConfirmation = true
+                this.cancelDelivery = true
+                return
+              }
+            }
+          }
+        }
+      }
     },
     // 合计
     getSummaries(param) {

src/views/basicdata/goods/index.vue

@@ -250,7 +250,7 @@
       >
         <template slot-scope="scope">
           <span v-if="item.label == 'ifCntrno'">
-            
+
             <span v-if="scope.row.ifCntrno=='1'">是</span>
             <span v-else>否</span>
           </span>
@@ -412,7 +412,37 @@
             </el-form-item>
           </el-col>
         </el-row>
-
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="账册号" prop="fEmsNo">
+              <el-input v-model="form.fEmsNo" placeholder="请输入账册号"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="账册序号" prop="fEmsSeqNo">
+              <el-input v-model="form.fEmsSeqNo" placeholder="请输入账册序号"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="申报单位" prop="fWmsDclUnit">
+              <el-input v-model="form.fWmsDclUnit" placeholder="请输入申报计量单位"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="法定单位" prop="fWmsLawUnit">
+              <el-input v-model="form.fWmsLawUnit" placeholder="请输入法定计量单位"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="商品编码" prop="fGoodsTs">
+              <el-input v-model="form.fGoodsTs" placeholder="请输入商品编码"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="状态">
@@ -672,6 +702,41 @@ export default {
         },
         {
           surface: "10",
+          label: "fEmsNo",
+          name: "账册号",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "11",
+          label: "fEmsSeqNo",
+          name: "账册序号",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "12",
+          label: "fGoodsTs",
+          name: "商品编码",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "13",
+          label: "fEmsSeqNo",
+          name: "申报单位",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "14",
+          label: "fWmsLawUnit",
+          name: "法定单位",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "15",
           label: "ifCntrno",
           name: "是否按照箱号统计",
           checked: 0,

src/views/finance/query/index.vue

@@ -183,6 +183,15 @@
               </el-form-item>
             </el-col>
             <el-col :xs="12" :sm="6">
+              <el-form-item label="业务编号" prop="fSrcBillno">
+                <el-input
+                  v-model="queryParams.fSrcBillno"
+                  placeholder="请输入业务编号"
+                  clearable
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :xs="12" :sm="6">
               <el-form-item label="对账状态">
                 <el-select
                   v-model="queryParams.feesStatus"
@@ -447,145 +456,175 @@ export default {
           name: "提单号",
           checked: 0,
           width: 180,
-        }, {
+        },
+        {
           surface: "3",
+          label: "fSrcBillno",
+          name: "业务编号",
+          checked: 0,
+          width: 180,
+        },{
+          surface: "4",
           label: "fBsdate",
           name: "业务日期",
           checked: 0,
           width: 100,
         },{
-          surface: "4",
+          surface: "5",
           label: "fReviewDate",
           name: "审核日期",
           checked: 0,
           width: 100,
-        },{
-          surface: "5",
+        },
+        {
+          surface: "6",
           label: "feeName",
           name: "费用名称",
           checked: 0,
           width: 100,
         },
         {
-          surface: "6",
+          surface: "7",
           label: "fBillstatusName",
           name: "费用状态",
           checked: 0,
           width: 100,
-        },{
-          surface: "6",
+        },
+        {
+          surface: "8",
+          label: "fChargedate",
+          name: "费用起始日期",
+          checked: 0,
+          width: 130,
+        },
+        {
+          surface: "9",
+          label: "fBillingDeadline",
+          name: "费用截止日期",
+          checked: 0,
+          width: 130,
+        },
+        {
+          surface: "10",
+          label: "fOriginalbilldate",
+          name: "原始入库日期",
+          checked: 0,
+          width: 130,
+        },
+        {
+          surface: "10",
           label: "fDc",
           name: "收/付",
           checked: 0,
           width: 100,
         },
         {
-          surface: "7",
+          surface: "11",
           label: "fAmount",
           name: "金额",
           checked: 0,
           width: 100,
         },
         {
-          surface: "8",
+          surface: "12",
           label: "fStlamount",
           name: "结算金额",
           checked: 0,
           width: 100,
         },
         {
-          surface: "9",
+          surface: "13",
           label: "fStlamountDate",
           name: "结算日期",
           checked: 0,
           width: 100,
         },
         {
-          surface: "10",
+          surface: "14",
           label: "fInvamount",
           name: "开票金额",
           checked: 0,
           width: 100,
         },
         {
-          surface: "11",
+          surface: "15",
           label: "fInvnos",
           name: "发票号",
           checked: 0,
           width: 100,
         },
         {
-          surface: "12",
+          surface: "16",
           label: "fAccamount",
           name: "对账金额",
           checked: 0,
           width: 100,
         },
         {
-          surface: "13",
+          surface: "17",
           label: "fAccamountDate",
           name: "对账日期",
           checked: 0,
           width: 100,
         },
         {
-          surface: "14",
+          surface: "18",
           label: "fStatementNo",
           name: "对账单号",
           checked: 0,
           width: 100,
         },
         {
-          surface: "15",
+          surface: "19",
           label: "fFeeunitid",
           name: "计价单位",
           checked: 0,
           width: 100,
         },
         {
-          surface: "16",
+          surface: "20",
           label: "fQty",
           name: "数量",
           checked: 0,
           width: 100,
         },
         {
-          surface: "17",
+          surface: "21",
           label: "fUnitprice",
           name: "单价",
           checked: 0,
           width: 100,
         },
         {
-          surface: "18",
+          surface: "22",
           label: "fBilltype",
           name: "业务类型",
           checked: 0,
           width: 100,
         },
         {
-          surface: "18",
+          surface: "23",
           label: "fStltypeid",
           name: "结算方式",
           checked: 0,
           width: 100,
         },
         {
-          surface: "19",
+          surface: "24",
           label: "fProductName",
           name: "货物名称",
           checked: 0,
           width: 100,
         },
         {
-          surface: "20",
+          surface: "25",
           label: "fShipper",
           name: "发货方(货主)",
           checked: 0,
           width: 130,
         },
         {
-          surface: "20",
+          surface: "26",
           label: "remark",
           name: "备注",
           checked: 0,

src/views/warehouseBusiness/storageFeeCalculation/index.vue

@@ -1129,7 +1129,7 @@ import {
 import {listUser, queryUserVal} from "@/api/system/user";
 import {listGoods} from "@/api/basicdata/goods";
 import {listFees} from "@/api/basicdata/fees";
-import {listCorps} from "@/api/basicdata/corps";
+import { agreementListCorps, listCorps } from '@/api/basicdata/corps'
 import moment from 'moment'
 import AddOrUpdate from '@/views/viewApproval'
 import ApprovalComments from '@/views/startApproval'
@@ -1446,7 +1446,7 @@ export default {
       rules: {
         fCorpid: [{required: true, message: " ", trigger: "blur",}],
         fBillingDeadline: [{required: true, message: " ", trigger: "blur",}],
-        fGoodsid: [{required: true, message: " ", trigger: "blur",}]
+        fGoodsid: [{required: false, message: " ", trigger: "blur",}]
       },
       pickerOptions: {
         shortcuts: [{
@@ -1818,7 +1818,7 @@ export default {
     calculateCost() {
       this.countstate = true
       if (!this.form.fCorpid || !this.form.fBillingDeadline) {
-        this.$message({message: '请维护货权方以及，仓储费计算截止日期', type: 'warning'})
+        this.$message({message: '请维护客户名称以及，仓储费计算截止日期', type: 'warning'})
         this.countstate = false
         return false
       }
@@ -2282,7 +2282,7 @@ export default {
         return false;
       }
       let queryParams = {pageNum: 1, pageSize: 10, fName: name};
-      listCorps(queryParams).then((response) => {
+      agreementListCorps(queryParams).then((response) => {
         this.fMblnoOptions = response.rows;
       });
     },