Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev

src/api/aftersales/aftersalesWorkOrder.js

@@ -22,6 +22,19 @@ export const getDetail = (id) => {
   })
 }
 
+
+export const getProcessor = (current, size, params) => {
+  return request({
+    url: '/api/logpm-aftersales/aftersalesWorkOrder/pendingWorkOrder',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
+
 export const remove = (ids) => {
   return request({
     url: '/api/logpm-aftersales/aftersalesWorkOrder/remove',

src/api/distribution/createTask.js

@@ -56,6 +56,67 @@ export const postBatchDelete = params => {
   });
 };
 
+
+/**
+ * 盘点详情
+ */
+export const $_getDetailInfo = params => {
+  return request({
+    url: '/api/logpm-warehouse/blade-taskQuest/taskQuest/getDetailInfo',
+    method:'get',
+    params,
+  });
+};
+
+
+
+/**
+ * 盘点状态修改
+ */
+export const $_updateQuestChildInfo = data => {
+  return request({
+    url: '/api/logpm-warehouse/blade-taskQuest/taskQuest/updateQuestChildInfo',
+    method:'put',
+    data,
+  });
+};
+
+/**
+ * 盘点详情保存
+ */
+export const $_updateDetailInfo = data => {
+  return request({
+    url: '/api/logpm-warehouse/blade-taskQuest/taskQuest/updateDetailInfo',
+    method: 'put',
+    data,
+  });
+};
+
+
+
+/**
+ * 盘点日期延期
+ */
+export const $_updateDate = data => {
+  return request({
+    url: '/api/logpm-warehouse/blade-taskQuest/taskQuest/updateDate',
+    method: 'put',
+    data,
+  });
+};
+
+
+/**
+ * 盘点对比数据
+ */
+export const $_getContrastInfo = params => {
+  return request({
+    url: '/api/logpm-warehouse/blade-taskQuest/taskQuest/getContrastInfo',
+    method: 'get',
+    params,
+  });
+};
+
 // 查看详情
 // export const $_AddInfo = data => {
 //   return request({

src/option/aftersales/aftersalesWorkOrder.js

@@ -89,18 +89,12 @@ export default {
       hide: true,
     },
     {
-      label: "工单异常类型;货损，少货，窜货，加急，其他",
+      label: "异常类型 ",
       prop: "workOrderType",
       search: true,
     },
     {
-      label: "发起工单标识;PDA，PC",
+      label: "发现节点 ",
-      prop: "initiationIdentification",
-      display: false,
-      hide: true,
-    },
-    {
-      label: "发现节点;提货，发货，干线，库内，配送，其他，签收（PC），安装（PC）",
       prop: "discoveryNode",
       search: true,
     },
@@ -119,7 +113,7 @@ export default {
       search: true,
     },
     {
-      label: "车次号 (干线卸车环节)",
+      label: "车次号",
       prop: "trainNumber",
     },
     {
@@ -131,7 +125,7 @@ export default {
       prop: "secondary",
     },
     {
-      label: "车辆路线;车次号、通过车次号自动带出车辆线路",
+      label: "车辆路线 ",
       prop: "vehicleRoute",
     },
     {
@@ -139,11 +133,11 @@ export default {
       prop: "deliverGoodsTime",
     },
     {
-      label: "发现时间 （库内作业环节,配送装车环节）",
+      label: "发现时间",
       prop: "discoveryTime",
     },
     {
-      label: "入库时间（库内作业环节）",
+      label: "入库时间",
       prop: "warehousingTime",
     },
     {
@@ -155,29 +149,21 @@ export default {
       prop: "remarks",
     },
     {
-      label: "配送时间(配送装车环节)",
+      label: "配送时间",
       prop: "deliveryTime",
     },
     {
-      label: "配送司机(配送装车环节)",
+      label: "配送司机",
       prop: "deliveryDriver",
     },
     {
       label: "工单状态",
       prop: "workOrderStatus",
     },
-    {
-      label: "归属客服ID",
-      prop: "customerServiceId",
-    },
     {
       label: "归属客服名称",
       prop: "customerServiceName",
     },
-    {
-      label: "商场ID",
-      prop: "waybillMallId",
-    },
     {
       label: "完结时间",
       prop: "overTime",
@@ -186,10 +172,6 @@ export default {
       label: "异常问题描述",
       prop: "problemDescription",
     },
-    {
-      label: "仓库ID",
-      prop: "warehouseId",
-    },
     {
       label: "责任人 （库内作业环节）",
       prop: "personResponsible",
@@ -209,12 +191,6 @@ export default {
     {
       label: "财务入账时间",
       prop: "entryTime",
-    },
+    }
-    {
-      label: "操作人",
-      prop: "operator",
-      display: false,
-      hide: true,
-    },
   ]
 }

src/router/views/index.js

@@ -1076,6 +1076,19 @@ export default [
     ],
   },
 
+{
+  path: '/distribution/checkInventoryTask/createTaskTemp',
+  component: Layout,
+  redirect: '/distribution/checkInventoryTask/createTaskTemp',
+  children: [
+    {
+      path: '/distribution/checkInventoryTask/createTaskTemp',
+      name: '盘点重构',
+      component: () => import('@/views/distribution/checkInventoryTask/createTaskTemp.vue'),
+    },
+  ],
+},
+
   // {
   //   path: '/distribution/turndelivery/devtmp',
   //   component: Layout,

src/views/aftersales/aftersalesWorkOrder.vue

@@ -4,11 +4,29 @@
       <el-row :hidden="!search" style="padding:6px 18px">
         <!-- 查询模块 -->
         <el-form :inline="true" :model="query">
-          <el-form-item label="工单异常类型;货损，少货，窜货，加急，其他:">
+          <el-form-item label="异常类型:">
-            <el-input v-model="query.workOrderType" placeholder="请输入工单异常类型;货损，少货，窜货，加急，其他"></el-input>
+<!--            <el-input v-model="query.workOrderType" placeholder="请输入工单异常类型;货损，少货，窜货，加急，其他"></el-input>-->
-          </el-form-item>
+            <el-select v-model="query.workOrderType" placeholder="请输入工单异常类型;货损，少货，窜货，加急，其他" >
-          <el-form-item label="发现节点;提货，发货，干线，库内，配送，其他，签收（PC），安装（PC）:">
+                <el-option
-            <el-input v-model="query.discoveryNode" placeholder="请输入发现节点;提货，发货，干线，库内，配送，其他，签收（PC），安装（PC）"></el-input>
+                v-for="item in this.workOrder"
+                :key="item.dictKey"
+                :label="item.dictValue"
+                :value="item.dictKey">
+                </el-option>
+             </el-select>
+
+         
+          </el-form-item>
+          <el-form-item label="发现节点:">
+<!--            <el-input v-model="query.discoveryNode" placeholder="请输入发现节点;提货，发货，干线，库内，配送，其他，签收（PC），安装（PC）"></el-input>-->
+              <el-select v-model="query.discoveryNode" placeholder="请输入发现节点;提货，发货，干线，库内，配送，其他，签收（PC），安装（PC）" >
+                <el-option
+                  v-for="item in this.discoveryNode"
+                  :key="item.dictKey"
+                  :label="item.dictValue"
+                  :value="item.dictKey">
+                </el-option>
+              </el-select>
           </el-form-item>
           <el-form-item label="异常工单号:">
             <el-input v-model="query.workOrderNumber" placeholder="请输入异常工单号"></el-input>
@@ -27,8 +45,11 @@
         <div class="avue-crud__header">
           <!-- 头部左侧按钮模块 -->
           <div class="avue-crud__left">
-            <el-button v-if="this.permissionList.addBtn" type="primary" icon="el-icon-plus" @click="handleAdd">新 增</el-button>
+<!--            <el-button v-if="this.permissionList.addBtn" type="primary" icon="el-icon-plus" @click="handleAdd">新 增</el-button>-->
-            <el-button v-if="this.permissionList.delBtn" type="danger" icon="el-icon-delete" @click="handleDelete" plain>删 除</el-button>
+<!--            <el-button v-if="this.permissionList.delBtn" type="danger" icon="el-icon-delete" @click="handleDelete" plain>删 除</el-button>-->
+            <el-button   type="primary" icon="el-icon-plus" @click="handleAdd">新 增</el-button>
+            <el-button   type="danger" icon="el-icon-delete" @click="handleDelete" plain>删 除</el-button>
+            <el-button   type="danger" icon="el-icon-delete" @click="handleProcessor" plain>处理方信息</el-button>
           </div>
           <!-- 头部右侧按钮模块 -->
           <div class="avue-crud__right">
@@ -60,7 +81,7 @@
           </template>
           <!-- 操作栏模块 -->
           <el-table-column prop="menu" label="操作" :width="220" align="center">
-            <template #="{row}">
+            <template #default="{row}">
               <el-button v-if="this.permissionList.viewBtn" type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>
               <el-button v-if="this.permissionList.editBtn" type="primary" text icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>
               <el-button v-if="this.permissionList.delBtn" type="primary" text icon="el-icon-delete" @click="rowDel(row)">删除</el-button>
@@ -89,22 +110,22 @@
                  width="50%"
                  :before-close="beforeClose"
                  append-to-body>
-        <el-form :disabled="view" ref="form" :model="form" label-width="80px">
+        <el-form :disabled="view" ref="form" :model="form" label-width="120px">
           <!-- 表单字段 -->
-          <el-form-item label="工单异常类型;货损，少货，窜货，加急，其他" prop="workOrderType">
+          <el-form-item label="异常类型 " prop="workOrderType">
             <el-select v-model="form.workOrderType" clearable placeholder="请选择工单异常类型;货损，少货，窜货，加急，其他">
               <el-option
-                v-for="item in workOrderTypeData"
+                v-for="item in workOrder"
                 :key="item.dictKey"
                 :label="item.dictValue"
                 :value="item.dictKey">
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="发现节点;提货，发货，干线，库内，配送，其他，签收（PC），安装（PC）" prop="discoveryNode">
+          <el-form-item label="发现节点 " prop="discoveryNode">
             <el-select v-model="form.discoveryNode" clearable placeholder="请选择发现节点;提货，发货，干线，库内，配送，其他，签收（PC），安装（PC）">
               <el-option
-                v-for="item in discoveryNodeData"
+                v-for="item in discoveryNode"
                 :key="item.dictKey"
                 :label="item.dictValue"
                 :value="item.dictKey">
@@ -120,7 +141,7 @@
           <el-form-item label="订单自编号" prop="orderCode">
             <el-input v-model="form.orderCode" placeholder="请输入订单自编号"/>
           </el-form-item>
-          <el-form-item label="车次号 (干线卸车环节)" prop="trainNumber">
+          <el-form-item label="车次号 " prop="trainNumber">
             <el-input v-model="form.trainNumber" placeholder="请输入车次号 (干线卸车环节)"/>
           </el-form-item>
           <el-form-item label="一级品类" prop="first">
@@ -129,17 +150,38 @@
           <el-form-item label="二级品类" prop="secondary">
             <el-input v-model="form.secondary" placeholder="请输入二级品类"/>
           </el-form-item>
-          <el-form-item label="车辆路线;车次号、通过车次号自动带出车辆线路" prop="vehicleRoute">
+          <el-form-item label="车辆路线 " prop="vehicleRoute">
             <el-input v-model="form.vehicleRoute" placeholder="请输入车辆路线;车次号、通过车次号自动带出车辆线路"/>
           </el-form-item>
           <el-form-item label="送货时间" prop="deliverGoodsTime">
-            <el-input v-model="form.deliverGoodsTime" placeholder="请输入送货时间"/>
+            <!-- <el-input v-model="form.deliverGoodsTime" placeholder="请输入送货时间"/> -->
-          </el-form-item>
+             <el-date-picker
-          <el-form-item label="发现时间 （库内作业环节,配送装车环节）" prop="discoveryTime">
+             v-model="form.deliverGoodsTime"
-            <el-input v-model="form.discoveryTime" placeholder="请输入发现时间 （库内作业环节,配送装车环节）"/>
+              type="datetime"
-          </el-form-item>
+              format="YYYY-MM-DD HH:mm:ss" 
-          <el-form-item label="入库时间（库内作业环节）" prop="warehousingTime">
+              value-format="YYYY-MM-DD HH:mm:ss"
-            <el-input v-model="form.warehousingTime" placeholder="请输入入库时间（库内作业环节）"/>
+              placeholder="选择日期时间">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="发现时间 " prop="discoveryTime">
+            <!-- <el-input v-model="form.discoveryTime" placeholder="请输入发现时间 （库内作业环节,配送装车环节）"/> -->
+            <el-date-picker
+            v-model="form.discoveryTime"
+              type="datetime"
+              format="YYYY-MM-DD HH:mm:ss" 
+              value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="选择日期时间">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="入库时间 " prop="warehousingTime">
+            <!-- <el-input v-model="form.warehousingTime" placeholder="请输入入库时间（库内作业环节）"/> -->
+            <el-date-picker
+            v-model="form.warehousingTime"
+              type="datetime"
+              format="YYYY-MM-DD HH:mm:ss" 
+              value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="选择日期时间">
+            </el-date-picker>
           </el-form-item>
           <el-form-item label="运单商场" prop="waybillMall">
             <el-input v-model="form.waybillMall" placeholder="请输入运单商场"/>
@@ -147,37 +189,64 @@
           <el-form-item label="备注" prop="remarks">
             <el-input v-model="form.remarks" placeholder="请输入备注"/>
           </el-form-item>
-          <el-form-item label="配送时间(配送装车环节)" prop="deliveryTime">
+          <el-form-item label="处理方 " prop="deliveryTime">
-            <el-input v-model="form.deliveryTime" placeholder="请输入配送时间(配送装车环节)"/>
+            <!-- <el-input v-model="form.processor" placeholder="请输入配送时间(配送装车环节)"/> -->
+            <el-select v-model="processor" placeholder="请选择">
+              <el-option
+                v-for="item in warehouseData"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="责任方 " prop="deliveryTime">
+            <!-- <el-input v-model="form.duty" placeholder="请输入配送时间(配送装车环节)"/> -->
+            <el-select v-model="duty" placeholder="请选择">
+              <el-option
+                v-for="item in warehouseData"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id">
+              </el-option>
+            </el-select>
           </el-form-item>
-          <el-form-item label="配送司机(配送装车环节)" prop="deliveryDriver">
+          <el-form-item label="配送时间 " prop="deliveryTime">
+            <!-- <el-input v-model="form.deliveryTime" placeholder="请输入配送时间(配送装车环节)"/> -->
+            <el-date-picker
+            v-model="form.deliveryTime"
+              type="datetime"
+              format="YYYY-MM-DD HH:mm:ss" 
+              value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="选择日期时间">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="配送司机 " prop="deliveryDriver">
             <el-input v-model="form.deliveryDriver" placeholder="请输入配送司机(配送装车环节)"/>
           </el-form-item>
-          <el-form-item label="工单状态" prop="workOrderStatus">
+         <!-- <el-form-item label="工单状态" prop="workOrderStatus">
             <el-input v-model="form.workOrderStatus" placeholder="请输入工单状态"/>
-          </el-form-item>
+          </el-form-item>-->
-          <el-form-item label="归属客服ID" prop="customerServiceId">
+
-            <el-input v-model="form.customerServiceId" placeholder="请输入归属客服ID"/>
+        <!--  <el-form-item label="归属客服名称" prop="customerServiceName">
-          </el-form-item>
-          <el-form-item label="归属客服名称" prop="customerServiceName">
             <el-input v-model="form.customerServiceName" placeholder="请输入归属客服名称"/>
-          </el-form-item>
+          </el-form-item>-->
-          <el-form-item label="商场ID" prop="waybillMallId">
+
-            <el-input v-model="form.waybillMallId" placeholder="请输入商场ID"/>
+          <!-- <el-form-item label="完结时间" prop="overTime">
-          </el-form-item>
-          <el-form-item label="完结时间" prop="overTime">
             <el-input v-model="form.overTime" placeholder="请输入完结时间"/>
-          </el-form-item>
+            <el-date-picker
+              v-model="value1"
+              type="datetime"
+              placeholder="选择日期时间">
+            </el-date-picker>
+          </el-form-item> -->
           <el-form-item label="异常问题描述" prop="problemDescription">
             <el-input v-model="form.problemDescription" placeholder="请输入异常问题描述"/>
           </el-form-item>
-          <el-form-item label="仓库ID" prop="warehouseId">
+          <el-form-item label="责任人" prop="personResponsible">
-            <el-input v-model="form.warehouseId" placeholder="请输入仓库ID"/>
-          </el-form-item>
-          <el-form-item label="责任人 （库内作业环节）" prop="personResponsible">
             <el-input v-model="form.personResponsible" placeholder="请输入责任人 （库内作业环节）"/>
           </el-form-item>
-          <el-form-item label="钉钉流程号" prop="processNumber">
+        <!--  <el-form-item label="钉钉流程号" prop="processNumber">
             <el-input v-model="form.processNumber" placeholder="请输入钉钉流程号"/>
           </el-form-item>
           <el-form-item label="审核人" prop="reviewedBy">
@@ -188,7 +257,7 @@
           </el-form-item>
           <el-form-item label="财务入账时间" prop="entryTime">
             <el-input v-model="form.entryTime" placeholder="请输入财务入账时间"/>
-          </el-form-item>
+          </el-form-item>-->
         </el-form>
         <!-- 表单按钮 -->
         <template #footer>
@@ -203,9 +272,11 @@
 </template>
 
 <script>
-import { getList, getDetail, add, update, remove } from "@/api/aftersales/aftersalesWorkOrder";
+import { getList, getDetail, add, update, remove,getProcessor } from "@/api/aftersales/aftersalesWorkOrder";
 import option from "@/option/aftersales/aftersalesWorkOrder";
+import { getDetailWarehouse,getDeptWarehouse } from "@/api/basicdata/basicdataWarehouse";
 import { mapGetters } from "vuex";
+import { getDictionaryBiz } from '@/api/system/dict';
 
 export default {
   data () {
@@ -237,6 +308,11 @@ export default {
       option: option,
       // 表单列表
       data: [],
+      discoveryNode: [], // 发现节点
+      workOrder: [],// 工单节点0
+      processor: '',// 处理方
+      duty: '',// 责任方
+      warehouseData: [], // 仓库数据
     }
   },
   mounted() {
@@ -264,7 +340,37 @@ export default {
   methods: {
     init() {
       this.height = this.setPx(document.body.clientHeight - 340);
+      getDictionaryBiz('pc_work_order').then(res => { //异常类型
+        this.workOrder = res.data.data;
+        console.log("异常工单字典",this.workOrder);
+        /*this.$functions.checkcColumnList('typeServerName', this.columnList).checkarr =
+          res.data.data.map(item => {
+            item.value = item.dictKey;
+            item.label = item.dictValue;
+            return item;
+          });*/
+      });
+      getDictionaryBiz('pc_discovery_node').then(res => { //发现环节
+        this.discoveryNode = res.data.data;
+        console.log("发起环节字典",this.discoveryNode);
+        /*this.$functions.checkcColumnList('typeServerName', this.columnList).checkarr =
+          res.data.data.map(item => {
+            item.value = item.dictKey;
+            item.label = item.dictValue;
+            return item;
+          });*/
+      });
+      this.getWarehouseInfo();
     },
+    //查询全部仓库信息
+    getWarehouseInfo(){
+      let ro ={}
+      getDeptWarehouse(ro).then(res =>{
+        this.warehouseData = res.data.data;
+          console.log("仓库信息",res.data.data);
+
+      });
+      },
     searchHide() {
       this.search = !this.search;
     },
@@ -278,6 +384,26 @@ export default {
     },
     handleSubmit() {
       if (!this.form.id) {
+        let processorEntityList =[];
+          let row= { //处理方
+            businessName: this.warehouseData.find(q=> q.id === this.processor).name ,
+            businessId: this.processor ,
+            conditions: 1,
+            typesOf:2
+          }
+         processorEntityList.push(row);   
+         let row1= { //责任方
+            businessName: this.warehouseData.find(q=> q.id === this.duty).name ,
+            businessId: this.duty ,
+            conditions: 1,
+            typesOf:1
+          }
+          processorEntityList.push(row1);  
+
+        console.log("数据????>>",processorEntityList);
+        this.form.processorEntityList = processorEntityList;
+
+
         add(this.form).then(() => {
           this.box = false;
           this.onLoad(this.page);
@@ -302,7 +428,34 @@ export default {
       this.form = {}
       this.box = true
     },
-    handleEdit(row) {
+    //查询处理方数据
+    handleProcessor() {
+      
+      const {
+        workOrderType,
+        discoveryNode,
+        workOrderNumber,
+        orderCode,
+      } = this.query;
+
+      let values = {
+        workOrderType_: workOrderType,
+        discoveryNode_: discoveryNode,
+        workOrderNumber_: workOrderNumber,
+        orderCode_: orderCode,
+      };
+
+      getProcessor(this.page.currentPage, this.page.pageSize, values).then(res => {
+        const data = res.data.data;
+        this.page.total = data.total;
+        this.data = data.records;
+        this.loading = false;
+        this.selectionClear();
+        console.log("处理方数据>>>>",this.data);
+      });
+
+    },
+    handle(row) {
       this.title = '编辑'
       this.box = true
       getDetail(row.id).then(res => {

src/views/basicdata/brand/basicClient.vue

@@ -205,7 +205,7 @@
             />
           </el-form-item>
           <el-form-item label="客户名称" prop="clientName">
-            <el-input v-model="form.clientName" placeholder="请输入客户名称" style="width: 100%" />
+            <el-input v-model="form.clientName" disabled placeholder="请输入客户名称" style="width: 100%" />
           </el-form-item>
           <el-form-item label="客户类型" prop="clientType">
             <!--            <el-input v-model="form.clientName" placeholder="请输入客户名称"  style="width: 100%"/>-->

src/views/distribution/inventory/distrilbutionBillLadingList.vue

@@ -68,6 +68,9 @@
               plain
               >导出
             </el-button>
+
+            <el-button type="primary" @click="printBatchOrder">批量打印</el-button>
+
           </div>
           <!-- 头部右侧按钮模块 -->
           <div class="avue-crud__right">
@@ -120,6 +123,9 @@
               >编辑提货信息</el-text
             >
             <!--            <el-button size="small" type="danger" icon="el-icon-edit" text @click="handleDeleteOwn(slotProps.scope)">删除</el-button>-->
+
+            <el-text size="small" text 
+              @click="handlePreview(slotProps.scope.row)">打印</el-text>
           </template>
         </tablecmt>
       </el-row>
@@ -188,6 +194,31 @@
           </span>
         </template>
       </el-dialog>
+
+      
+
+  <!-- 打印模块 -->
+  <el-dialog title="二维码" :visible.sync="isShow" width="780px" v-model="isShow">
+        <div>
+          <div v-html="html"></div>
+
+          <!-- <div v-for="(item,index) in qrCodeObj">
+            <el-row>
+              <el-col :span="24" >
+                <el-image  width="10" height="10" w-full  :key="index" :src="item " alt="Preview Image"/>
+              </el-col>
+            </el-row>
+          </div> -->
+        </div>
+        <span slot="footer" class="dialog-footer">
+          <!--    <el-button type="primary" @click="ddd">导 出</el-button>-->
+          <el-button type="primary" @click="printTemplate">打 印</el-button>
+          <el-button type="primary" @click="isShow = false">确 定</el-button>
+          <el-button @click="isShow = false">取 消</el-button>
+        </span>
+      </el-dialog>
+
+
     </div>
     <!-- <div class="avue-crud" :style="`height:`+ height ">
       <el-form :disabled="view" ref="form" :model="form" label-width="80px">
@@ -362,6 +393,9 @@ import {
   getListOwnNUm,
   getBillLadingExport,
 } from '@/api/distribution/distrilbutionBillLading';
+import {
+  printBatch,
+} from '@/api/distribution/distributionDeliveryList';
 import option from '@/option/distribution/distrilbutionBillLading';
 import { mapGetters } from 'vuex';
 import { getDictionaryBiz } from '@/api/system/dict';
@@ -387,7 +421,7 @@ export default {
           label: '提货批次',
           type: 2,
           values: '',
-          width: '130',
+          width: '140',
           checkarr: [],
           fixed: true,
           sortable: true,
@@ -408,7 +442,7 @@ export default {
           label: '运单号',
           type: 2,
           values: '',
-          width: '130',
+          width: '140',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -418,7 +452,7 @@ export default {
           label: '收货单位',
           type: 2,
           values: '',
-          width: '130',
+          width: '140',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -438,7 +472,7 @@ export default {
           label: '联系电话',
           type: 2,
           values: '',
-          width: '130',
+          width: '140',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -459,7 +493,7 @@ export default {
           label: '入库时间',
           type: 4,
           values: '',
-          width: '130',
+          width: '140',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -469,7 +503,7 @@ export default {
           label: '到付运费',
           type: 1,
           values: '',
-          width: '130',
+          width: '140',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -506,10 +540,10 @@ export default {
         },
         {
           prop: 'otherFee',
-          label: '其他增值费用',
+          label: '增值费用',
           type: 1,
           values: '',
-          width: '150',
+          width: '140',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -529,7 +563,7 @@ export default {
           label: '应提件数',
           type: 1,
           values: '',
-          width: '130',
+          width: '140',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -539,7 +573,7 @@ export default {
           label: '实提件数',
           type: 1,
           values: '',
-          width: '130',
+          width: '140',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -549,7 +583,7 @@ export default {
           label: '品牌',
           type: 2,
           values: '',
-          width: '130',
+          width: '120',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -559,7 +593,7 @@ export default {
           label: '货品信息',
           type: 2,
           values: '',
-          width: '130',
+          width: '140',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -569,7 +603,7 @@ export default {
           label: '提货手机',
           type: 2,
           values: '',
-          width: '130',
+          width: '140',
           checkarr: [],
           fixed: false,
           sortable: false,
@@ -589,7 +623,7 @@ export default {
           label: '提货车牌',
           type: 2,
           values: '',
-          width: '130',
+          width: '140',
           checkarr: [],
           fixed: false,
           sortable: false,
@@ -599,7 +633,7 @@ export default {
           label: '提货证件',
           type: 2,
           values: '',
-          width: '130',
+          width: '140',
           checkarr: [],
           fixed: false,
           sortable: false,
@@ -609,7 +643,7 @@ export default {
           label: '证件类型',
           type: 3,
           values: '',
-          width: '130',
+          width: '140',
           checkarr: [],
           fixed: false,
           sortable: false,
@@ -619,7 +653,7 @@ export default {
           label: '状态',
           type: 1,
           values: '',
-          width: '130',
+          width: '100',
           checkarr: [],
           fixed: false,
           sortable: false,
@@ -629,7 +663,7 @@ export default {
           label: '费用合计',
           type: 1,
           values: '',
-          width: '130',
+          width: '140',
           checkarr: [],
           fixed: false,
           sortable: false,
@@ -651,6 +685,10 @@ export default {
       height: 0,
       // 弹框标题
       title: '',
+            // 打印模版
+            html: '',
+      // 是否显示打印模版
+      isShow: false,
       // 是否展示弹框
       box: false,
       // 是否显示查询
@@ -846,9 +884,7 @@ export default {
     handleRemove(file, fileList) {
       console.log(file, fileList);
     },
-    handlePreview(file) {
+
-      console.log(file);
-    },
     textbox(e, index) {
       console.log('e,index', e, index);
       this.costList[index + 1] = e;
@@ -908,9 +944,7 @@ export default {
           return;
         }
         for (let a = 0; a < clientType.length; a++) {
-          // console.log("进来了",clientType[a].dictKey , costListName[i]);
           if (clientType[a].dictKey == costListName[i]) {
-            // console.log("进来了",clientType[a].dictKey , costListName[i]);
             let zhi = costList[costListName[i]];
             if (!zhi) {
               this.pan = true;
@@ -1005,7 +1039,6 @@ export default {
           ids = this.ids;
           break;
       }
-      console.log('签收！！', ids);
       await getBillLadingDetail(ids);
     },
     //删除
@@ -1021,6 +1054,50 @@ export default {
         },
       });
     },
+
+
+    // 预览页面
+    async handlePreview(row){
+      console.log('row :>> ', row);
+      const res = await printBatch({ ids: row.id, type: 3 });
+      console.log('res :>> ', res);
+      const {
+        data: { code, data },
+      } = res;
+      if (code === 200) {
+        // 初始化打印页面
+        this.html = '';
+        data.forEach(item => {
+          this.html += item.templateHtml;
+        });
+        this.isShow = true;
+      }
+
+    },
+        /**
+     * 批量打印
+     */
+     async printBatchOrder() {
+      if (this.selectionList.length === 0) {
+        this.$message.warning('请选择至少一条数据');
+        return;
+      }
+      this.isShow = true;
+      const res = await printBatch({ ids: Array.from(this.selectionList).join(','), type: 3 });
+      console.log('res :>> ', res);
+      const {
+        data: { code, data },
+      } = res;
+      if (code === 200) {
+        // 初始化打印页面
+        this.html = '';
+        data.forEach(item => {
+          this.html += item.templateHtml;
+        });
+      }
+    },
+
+
     handleEdits(row) {
       this.$router.push({
         path: '/distribution/inventory/distrilbutionBillLading',

vite.config.js

@@ -19,8 +19,8 @@ export default ({ mode, command }) => {
           // target: 'http://192.168.10.123:8889',
           // target: 'http://192.168.10.101:8888',
           // target: 'http://192.168.10.75:8777',
+             target: 'http://192.168.10.200:13000',
           // tjj
-          target: 'http://192.168.10.25:13000',
           // sst
           // target: 'http://192.168.10.94:8888',
           // target: 'http://test.api.huitongys.com',