Merge branch 'test' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-eom into dev

src/BIZComponents/outboundDetailsDialog.vue

@@ -36,12 +36,12 @@
                 <!--                <span>{{ getSceneState(infoData.bizType) }}</span>-->
               </el-form-item>
             </el-col>
-            <el-col :span="8" v-if="infoData.bizType == 3">
+            <el-col :span="8" >
               <el-form-item label="客户名称">
                 <span>{{ infoData.clientName }}</span>
               </el-form-item>
             </el-col>
-            <el-col :span="8" v-if="infoData.bizType == 3">
+            <!-- <el-col :span="8" v-if="infoData.bizType == 3">
               <el-form-item label="客户联系人">
                 <span>{{ infoData.clientUser }}</span>
               </el-form-item>
@@ -50,7 +50,7 @@
               <el-form-item label="客户电话">
                 <span>{{ infoData.clientPhone }}</span>
               </el-form-item>
-            </el-col>
+            </el-col> -->
 
             <el-col :span="8">
               <el-form-item

src/BIZComponents/outdetails.vue

@@ -38,11 +38,12 @@
                   <span>{{ extInfo?.documentSource }}</span>
                 </el-form-item>
               </el-col>
-              <el-col :span="8" v-if="infoData.bizType == 3">
+              <el-col :span="8" >
                 <el-form-item label="客户名称:">
                   <span>{{ infoData.clientName }}</span>
                 </el-form-item> </el-col
-              ><el-col :span="8" v-if="infoData.bizType == 3">
+              >
+              <!-- <el-col :span="8" v-if="infoData.bizType == 3">
                 <el-form-item label="客户联系人:">
                   <span>{{ infoData.clientUser }}</span>
                 </el-form-item> </el-col
@@ -50,7 +51,8 @@
                 <el-form-item label="客户电话:">
                   <span>{{ infoData.clientPhone }}</span>
                 </el-form-item>
-              </el-col>
+              </el-col> -->
+
               <el-col :span="8">
                 <el-form-item
                   :label="infoData.bizType == 4 ? '领料单:' : '来源单据:'"

src/views/purchasingManage/purchaseOrder/outSourceSend/components/addOrEditDialog.vue

@@ -89,7 +89,6 @@
         <el-col :span="12">
           <el-form-item prop="sendFiles" label="附件">
             <fileMain v-model="form.files"></fileMain>
-      
           </el-form-item>
         </el-col>
         <el-col :span="12"> </el-col>
@@ -144,6 +143,7 @@
   import { getByIdCondition } from '@/api/purchasingManage/purchaseOrder';
   // import fileMain from '@/components/addDoc/index.vue';
   import processSubmitDialog from '@/BIZComponents/processSubmitDialog/processSubmitDialog.vue';
+  import { getWarehouseListByIds } from '@/api/purchasingManage/returnGoods';
 
   export default {
     props: {
@@ -155,7 +155,7 @@
       // fileMain,
       fileUpload,
       inventoryTable,
-      orderListDialog,
+      orderListDialog
     },
     data() {
       return {
@@ -271,7 +271,7 @@
               partbLinkName,
               productList,
               sourceTypeName,
-              sourceType,
+              sourceType
             } = data;
             if (productList && productList.length > 0) {
               productList.forEach((v) => {
@@ -287,8 +287,7 @@
               orderId: id,
               sourceTypeName,
               sourceType,
-              productList,
-              
+              productList
             });
             this.$refs.inventoryTableref &&
               this.$refs.inventoryTableref.putTableValue(productList);
@@ -387,6 +386,12 @@
         const data = await getPurchaseOutSourceSendDetailAPI(
           this.businessId || res
         );
+
+        let storemanIds = '';
+        let ids = data.productList.map((item) => item.warehouseId);
+        let warehouseList = await getWarehouseListByIds(ids || []);
+        storemanIds = warehouseList.map((item) => item.ownerId);
+
         this.processSubmitDialogFlag = true;
         this.$nextTick(() => {
           let params = {
@@ -396,14 +401,9 @@
             variables: {
               businessCode: data.code,
               businessName: data.supplierName,
-              businessType: '委外发货单'
+              businessType: '委外发货单',
+              storemanIds: storemanIds.toString()
             }
-            // callBackMethodType : '1',
-            // callBackMethod : 'proTargetPlanApproveApiImpl.updatePlanApprovalStatus',
-            // pcHandle : '/bpm/handleTask/components/project-manage/plan-manage/submit.vue',
-            // pcView : '/bpm/handleTask/components/project-manage/plan-manage/detailDialog.vue',
-            // miniHandle : '',
-            // miniView : '',
           };
 
           this.$refs.processSubmitDialogRef.init(params);

src/views/purchasingManage/purchaseOrder/outSourceSend/index.vue

@@ -157,7 +157,7 @@
   import searchTable from './components/searchTable.vue';
   import addOrEditDialog from './components/addOrEditDialog.vue';
   import popModal from '@/components/pop-modal';
-  import { reviewStatus} from '@/enum/dict';
+  import { reviewStatus } from '@/enum/dict';
 
   import detailDialog from './components/detailDialog.vue';
 
@@ -174,9 +174,10 @@
   import { getPurchaseOutSourceSendDetailAPI } from '@/api/purchasingManage/outSourceSend';
   import { getWarehouseOutStock } from '@/api/saleManage/saleorder';
   import tabMixins from '@/mixins/tableColumnsMixin';
+  import { getWarehouseListByIds } from '@/api/purchasingManage/returnGoods';
 
   export default {
-    mixins: [dictMixins,tabMixins],
+    mixins: [dictMixins, tabMixins],
     components: {
       processSubmitDialog,
       addInvoiceDialog,
@@ -295,7 +296,7 @@
             fixed: 'right'
           }
         ],
-        cacheKeyUrl:'eos-aba18b2f-purchaseOrder-outSourceSend'
+        cacheKeyUrl: 'eos-aba18b2f-purchaseOrder-outSourceSend'
       };
     },
     computed: {},
@@ -318,8 +319,7 @@
       /* 刷新表格 */
       reload(where) {
         this.$refs.table.reload({ page: 1, where });
-        this.$emit('getToDoReminder')
-
+        this.$emit('getToDoReminder');
       },
 
       //新增编辑
@@ -379,7 +379,6 @@
       async sendSubmit(res) {
         const data = await getPurchaseOutSourceSendDetailAPI(res.id);
         const tabName = await this.warehouseOutStock(data);
-        console.log(tabName);
 
         if (tabName.filter((item) => !item.is).length > 0) {
           this.$message.error(
@@ -388,7 +387,10 @@
           );
           return;
         }
-
+        let storemanIds = '';
+        let ids = data.productList.map((item) => item.warehouseId);
+        let warehouseList = await getWarehouseListByIds(ids || []);
+        storemanIds = warehouseList.map((item) => item.ownerId);
         this.processSubmitDialogFlag = true;
         this.$nextTick(() => {
           let params = {
@@ -398,14 +400,13 @@
             variables: {
               businessCode: res.code,
               businessName: res.supplierName,
-              businessType: '委外发货单'
+              businessType: '委外发货单',
+              storemanIds: storemanIds.toString()
             }
-
           };
 
           this.$refs.processSubmitDialogRef.init(params);
         });
-
       },
       //查看详情
       openorderDetail(row, type) {

src/views/saleManage/saleOrder/invoice/components/print-template-jr.vue

@@ -13,6 +13,9 @@
           width: 100%;
         "
       >
+        <div style="font-size: 20px; font-weight: 800; margin: 0 auto">{{
+          groupName
+        }}</div>
         <div
           style="
             width: 100%;
@@ -22,11 +25,11 @@
           "
         >
           <span style="width: 40%">
-            <span style="width: 100px; display: inline-block"></span>
+            <span style="width: 100px; display: inline-block">购货单位：</span>
             {{ formData.contactName }}
           </span>
           <span>
-            <span style="width: 100px; display: inline-block"></span>
+            <span style="width: 100px; display: inline-block">单据编码：</span>
             {{ formData.docNo }} {{ page.length + '/' + (index + 1) }}
           </span>
         </div>
@@ -39,47 +42,52 @@
           "
         >
           <span style="width: 45%">
-            <span style="width: 170px; display: inline-block"></span>
+            <span style="width: 170px; display: inline-block"
+              >生产厂家/上市许可持有人：</span
+            >
             湖南聚仁中药饮片有限公司
           </span>
           <span style="width: 25%">
-            <span style="width: 80px; display: inline-block"></span>
+            <span style="width: 80px; display: inline-block">发货仓库：</span>
             {{ formData?.productList[0]?.warehouseName }}
           </span>
           <span style="width: 17%">
-            <span style="width: 80px; display: inline-block"></span>
+            <span style="width: 80px; display: inline-block">发货日期：</span>
             {{ formData.createTime.split(' ')[0] }}
           </span>
           <span>
-            <span style="width: 130px; display: inline-block"></span>
+            <span style=" display: inline-block">总计金额：</span>
             ￥{{ formData.totalPrice }}
           </span>
         </div>
         <table
           cellspacing="0"
+          border
           style="
             width: 100%;
             /* height: 240px; */
             table-layout: fixed;
             word-break: break-all;
-            word-wrap: break-word;margin-left: 10px;font-size: 12px;
+            word-wrap: break-word;
+            margin-left: 10px;
+            font-size: 12px;
           "
         >
           <tbody>
             <tr align="center" style="height: 28px">
-              <td style="width: 8%"> </td>
-              <td style="width: 8%"> </td>
-              <td style="width: 6%"> </td>
-              <td style="width:8%"> </td>
-              <td style="width: 4%"> </td>
-              <td style="width: 5.5%"> </td>
-              <td style="width: 6%"> </td>
-              <td style="width: 7%"> </td>
-              <td style="width: 8%"> </td>
-              <td style="width: 8%"> </td>
-              <td style="width: 8%"> </td>
-              <td> </td>
-              <!-- <td> </td> -->
+              <td style="width: 8%"> 商品编码</td>
+              <td style="width: 8%"> 品名</td>
+              <td style="width: 6%">规格 </td>
+              <td style="width: 8%"> 产地</td>
+              <td style="width: 4%"> 单位</td>
+              <td style="width: 5.5%">数量 </td>
+              <td style="width: 6%"> 单价</td>
+              <td style="width: 7%">金额 </td>
+              <td style="width: 8%"> 批号</td>
+              <td style="width: 8%"> 生产日期</td>
+              <td style="width: 8%"> 质保期至</td>
+              <td> 贮藏</td>
+              <td>备注 </td>
             </tr>
             <tr
               align="center"
@@ -105,7 +113,7 @@
               <td> {{ val.batchNo }}</td>
               <td> </td>
               <td> {{ val.guaranteePeriodDeadline }}</td>
-              <!-- <td> </td> -->
+              <td> </td>
               <td> {{ val.remark }}</td>
             </tr>
             <tr align="center" style="height: 30px">
@@ -136,24 +144,36 @@
           "
         >
           <div style="flex: 1">
-            <div>{{ formData.createUserName }}</div>
+            <div>开票员：{{ formData.createUserName }}</div>
           </div>
           <div style="flex: 1">
-            <div>{{ formData.saleOrderList[0]?.partbLinkName }}</div>
+            <div>业务员：{{ formData.saleOrderList[0]?.partbLinkName }}</div>
           </div>
           <div style="flex: 1">
-            <div></div>
+            <div>发货员：</div>
           </div>
           <div style="flex: 1">
-            <div></div>
+            <div>收货方：</div>
           </div>
           <div style="flex: 1">
-            <div></div>
+            <div>质量状况：</div>
           </div>
           <div style="flex: 1">
-            <div></div>
+            <div>提货方式：</div>
           </div>
         </div>
+        <div
+          style="
+            width: 100%;
+            font-size: 12px;
+            display: flex;
+            justify-content: space-between;
+            margin-top: 3x;
+          "
+        >
+          备注：品售出后非质量问题，超过一个月恕不退货。公司地址:长沙经济技术开发区星沙产业基地(长龙街道)红枫路9号
+          电话:0731-86178188 销售单位(未盖章无效)
+        </div>
       </div>
     </div>
 
@@ -329,21 +349,21 @@
         printWindow.document.write(`<style>
 
     body { font-family: "Courier New"; font-size: 9pt; }  
-    table { width:260mm; border-collapse: collapse; }  
+    table { width:310mm; border-collapse: collapse; }  
 @media print {
   table{
-    border:none
+    // border:none
   }
   .print {
     page-break-before: always !important;
     page-break-inside: avoid !important;
   }
   @page {
-     size: 260mm 110mm;
+     size: 310mm 110mm;
     margin: 10mm 10mm 10mm 10mm; /* 去除页边距 */
   }
   body {
-    width: 260mm;
+    width: 310mm;
     height:110mm;
     padding: 0;
     margin: 0;

src/views/saleManage/saleOrder/invoice/index.vue

@@ -79,10 +79,11 @@
                   >货物签收单</el-dropdown-item
                 >
 
-                <!-- <el-dropdown-item
+                <el-dropdown-item
+                  v-if="$hasPermission('eom:print-invoice7')"
                   @click.native="handlePrint('printTemplateJrRef')"
                   >发货单</el-dropdown-item
-                > -->
+                >
               </el-dropdown-menu>
             </el-dropdown>
             <exportButton
@@ -286,7 +287,6 @@
   import exportButton from '@/components/upload/exportButton.vue';
   import { downLoadTemplate } from '@/api/system/file/index.js';
 
-
   export default {
     mixins: [dictMixins, tabMixins],
     components: {
@@ -509,7 +509,10 @@
         });
       },
       exportFile(row) {
-          downLoadTemplate(`/eom/saleordersendrecord/export/${row.id}`,'货物签收单')
+        downLoadTemplate(
+          `/eom/saleordersendrecord/export/${row.id}`,
+          '货物签收单'
+        );
       },
       //创建退货单
       creatReturnGoods(type, row) {