Merge branch 'dev' into test

src/BIZComponents/inventoryTable.vue

@@ -1965,6 +1965,8 @@ export default {
         // console.log('colorKey~~', item.colorKey);
         this.$set(parasm, 'modelKey', item.modelKey?.split(',')?.[0] || '');
         this.$set(parasm, 'colorKey', item.colorKey?.split(',')?.[0] || '');
+        this.$set(parasm, 'technologyRouteName', item.technologyRouteName || '');
+        this.$set(parasm, 'technologyRouteId', item.technologyRouteId || '');
         if (this.defTaxRate) {
           this.$set(
             parasm,

src/views/commodityManagement/commodityPriceList/components/addDialog.vue

@@ -225,7 +225,7 @@
       v-show="activeComp == 'main'"
     />
     <template slot="footer">
-      <el-button type="primary" @click="save" v-if="type != 'view'"
+      <el-button :loading="loading" type="primary" @click="save" v-if="type != 'view'"
         >保存</el-button
       >
       <el-button @click="cancel">返回</el-button>

src/views/commodityManagement/commodityPriceList/components/commodityPriceListDialog.vue

@@ -422,18 +422,21 @@
           return this.$message.warning('请至少选择一条数据');
         }
         let list = this.currentIndex == -1 ? this.selection : [this.current];
-
         list = list.map((item) => {
+          const itemList  = item.goodsPriceList.filter(item => item.isDefault == 1)
+          const goodsPrice = itemList.length > 0 ? itemList[0] :  item.goodsPriceList[0];
           return {
             ...item.categoryInfo,
             goodsId: item.id,
             to: item.id,
-            goodsPriceId: item.goodsPriceList[0]?.id,
+            goodsPriceId: goodsPrice?.id,
             level: item.level,
-            goodsPriceType: item.goodsPriceList[0]?.priceType,
-            singlePrice: item.goodsPriceList[0]?.unitPrice,
-            notaxSinglePrice: item.goodsPriceList[0]?.excludeTaxPrice,
-            taxRate: item.goodsPriceList[0]?.taxRate
+            goodsPriceType: goodsPrice?.priceType,
+            singlePrice: goodsPrice?.unitPrice,
+            notaxSinglePrice: goodsPrice?.excludeTaxPrice,
+            taxRate: goodsPrice?.taxRate,
+            technologyRouteName: goodsPrice?.technologyRouteName,
+            technologyRouteId: goodsPrice?.technologyRouteId,
           };
         });
         let codeList = list.map((item) => item.code);

src/views/commodityManagement/commodityPriceList/components/productTable.vue

@@ -95,15 +95,15 @@
           >
             <el-input
               v-model="scope.row.technologyRouteName"
-              :disabled="isContractId"
+              :disabled="type == 'view'"
               placeholder="请选择"
               @click.native="openVersion(scope.$index)"
             ></el-input>
           </el-form-item>
         </template>
-        <template v-slot:validityPeriod="scope">
+        <template v-slot:priceExpiryDate="scope">
           <el-form-item
-            :prop="'datasource.' + scope.$index + '.validityPeriod'"
+            :prop="'datasource.' + scope.$index + '.priceExpiryDate'"
             :rules="{
               required: false,
               message: '请选择',
@@ -113,7 +113,8 @@
             <el-date-picker
               style="width: 100%"
               clearable
-              v-model="scope.row.validityPeriod"
+              :disabled="type == 'view'"
+              v-model="scope.row.priceExpiryDate"
               type="date"
               value-format="yyyy-MM-dd"
               placeholder="请选择日期"
@@ -240,18 +241,18 @@ export default {
           align: 'center',
           width: 110
         },
-        // {
-        //   prop: 'technologyRouteName',
-        //   label: '工艺路线',
-        //   slot: 'technologyRouteName',
-        //   align: 'center'
-        // },
-        // {
-        //   prop: 'validityPeriod',
-        //   label: '价格有效期',
-        //   slot: 'validityPeriod',
-        //   align: 'center'
-        // },
+        {
+          prop: 'technologyRouteName',
+          label: '工艺路线',
+          slot: 'technologyRouteName',
+          align: 'center'
+        },
+        {
+          prop: 'priceExpiryDate',
+          label: '价格有效期',
+          slot: 'priceExpiryDate',
+          align: 'center'
+        },
         {
           width: 180,
           columnKey: 'action',

src/views/purchasingManage/purchaseOrder/invoice/components/print-template-ht.vue

@@ -80,6 +80,7 @@
             <td style="padding: 5px"> 单价</td>
             <td style="padding: 5px"> 金额</td>
             <td style="padding: 5px"> 批次号</td>
+            <td style="padding: 5px"> 税率</td>
             <td style="padding: 5px"> 备注</td>
           </tr>
 
@@ -95,11 +96,12 @@
             <td style="padding: 5px"> {{ showPrice ? item.discountSinglePrice : ''}} </td>
             <td style="padding: 5px"> {{ showPrice ? item.discountTotalPrice : ''}} </td>
             <td style="padding: 5px"> {{ item.batchNo }}</td>
+            <td style="padding: 5px"> {{ item.taxRate ? item.taxRate + '%' : '' }}</td>
             <td style="padding: 5px"> {{ item.remark }}</td>
           </tr>
           <tr align="center">
             <td style="padding: 5px" colspan="2">合计 </td>
-            <td style="padding: 5px; text-align: left;" colspan="8">
+            <td style="padding: 5px; text-align: left;" colspan="9">
               <div style="display: flex;">
                 <span style="flex: 1"
                   >本页数量小计：{{ getAll(record, 'receiveTotalCount') }}</span
@@ -118,7 +120,7 @@
           </tr>
           <tr align="center">
             <td style="padding: 5px" colspan="2">合计金额（大写金额） </td>
-            <td style="padding: 5px; text-align: left;" colspan="8">
+            <td style="padding: 5px; text-align: left;" colspan="9">
               <div style="display: flex; margin-top: 6px;">
                 <span style="flex: 1"
                   >{{ showPrice ? convertToChinese(getAll(record, 'discountTotalPrice')) : '' }}</span
@@ -276,9 +278,9 @@ export default {
       const td = `${cellBase}font-family:'宋体';font-size:11pt;`;
       const labelLeft = `${border}padding:4px;mso-number-format:"\\@";vertical-align:middle;text-align:left;mso-horizontal-align:left;font-family:'宋体';font-size:11pt;`;
 
-      const colWidths = [50, 100, 120, 100, 60, 80, 90, 100, 80, 120];
+      const colWidths = [50, 100, 120, 100, 60, 80, 90, 100, 80, 60, 120];
       const colGroup = colWidths.map((w) => `<col width="${w}" style="width:${w}pt;" />`).join('');
-      const title = `${this.groupName || ''}入库单`;
+      const title = `${this.groupName ? this.groupName + '入库单' : '采购入库单'}`;
 
       // 遍历多个入库单，分别生成表格
       let tables = '';
@@ -313,6 +315,7 @@ export default {
             <td align="center" valign="middle" style="${td}">${this.showPrice ? item.discountSinglePrice : ''}</td>
             <td align="center" valign="middle" style="${td}">${rowTotal}</td>
             <td align="center" valign="middle" style="${td}">${item.batchNo || ''}</td>
+            <td align="center" valign="middle" style="${td}">${item.taxRate ? item.taxRate + '%' : ''}</td>
             <td align="center" valign="middle" style="${td}">${item.remark || ''}</td>
           </tr>`;
         }).join('');
@@ -322,15 +325,15 @@ export default {
           style="border-collapse:collapse;border:1px solid #000;mso-border-alt:solid #000 0.5pt;font-family:'宋体';font-size:11pt;text-align:center;">
           <colgroup>${colGroup}</colgroup>
           <tr height="40" style="height:40pt;">
-            <td colspan="10" align="center" valign="middle" style="${border}padding:6px;text-align:center;font-family:'宋体';font-size:22pt;font-weight:bold;">${title}</td>
+            <td colspan="11" align="center" valign="middle" style="${border}padding:6px;text-align:center;font-family:'宋体';font-size:22pt;font-weight:bold;">${title}</td>
           </tr>
           <tr height="26" style="height:26pt;">
-            <td colspan="4" align="left" valign="middle" style="${labelLeft}">供应商：${record.supplierName || ''}</td>
+            <td colspan="5" align="left" valign="middle" style="${labelLeft}">供应商：${record.supplierName || ''}</td>
             <td colspan="3" align="left" valign="middle" style="${labelLeft}">日期：${record.receiveDate || ''}</td>
             <td colspan="3" align="left" valign="middle" style="${labelLeft}">编号：${record.receiveNo || ''}</td>
           </tr>
           <tr height="26" style="height:26pt;">
-            <td colspan="10" align="left" valign="middle" style="${labelLeft}">摘要：</td>
+            <td colspan="11" align="left" valign="middle" style="${labelLeft}">摘要：</td>
           </tr>
           <tr height="28" style="height:28pt;">
             <td align="center" valign="middle" style="${th}">编号</td>
@@ -342,12 +345,13 @@ export default {
             <td align="center" valign="middle" style="${th}">单价</td>
             <td align="center" valign="middle" style="${th}">金额</td>
             <td align="center" valign="middle" style="${th}">批次号</td>
+            <td align="center" valign="middle" style="${th}">税率</td>
             <td align="center" valign="middle" style="${th}">备注</td>
           </tr>
           ${rows}
           <tr height="26" style="height:26pt;">
             <td align="center" valign="middle" style="${td};font-weight:bold;">合计</td>
-            <td colspan="9" align="left" valign="middle" style="${td};font-weight:bold;">
+            <td colspan="10" align="left" valign="middle" style="${td};font-weight:bold;">
               <span>本页数量小计：${totalCount}</span>
               <span style="margin-left:40px;">本页金额小计：${totalPrice}</span>
               <span style="margin-left:40px;">汇总数量：${totalCount}</span>
@@ -356,15 +360,15 @@ export default {
           </tr>
           <tr height="26" style="height:26pt;">
             <td align="center" valign="middle" style="${td};font-weight:bold;">合计金额（大写金额）</td>
-            <td colspan="9" align="left" valign="middle" style="${td};font-weight:bold;">
+            <td colspan="10" align="left" valign="middle" style="${td};font-weight:bold;">
               ${this.showPrice ? convertToChinese(totalPriceNum) : ''}
             </td>
           </tr>
           <tr height="28" style="height:28pt;">
-            <td colspan="2" align="left" valign="middle" style="${labelLeft}">收货单审核人：${record.reviewerName || ''}</td>
-            <td colspan="2" align="left" valign="middle" style="${labelLeft}">采购发起人：${record.purchaseInitiatorName || ''}</td>
-            <td colspan="2" align="left" valign="middle" style="${labelLeft}">质检人：${record.qualityName || ''}</td>
-            <td colspan="4" align="left" valign="middle" style="${labelLeft}">仓管员：${record.warehouseKeeperName || ''}</td>
+            <td colspan="3" align="left" valign="middle" style="${labelLeft}">收货单审核人：${record.reviewerName || ''}</td>
+            <td colspan="3" align="left" valign="middle" style="${labelLeft}">采购发起人：${record.purchaseInitiatorName || ''}</td>
+            <td colspan="3" align="left" valign="middle" style="${labelLeft}">质检人：${record.qualityName || ''}</td>
+            <td colspan="2" align="left" valign="middle" style="${labelLeft}">仓管员：${record.warehouseKeeperName || ''}</td>
           </tr>
         </table>`;
 

src/views/saleManage/saleOrder/index.vue

@@ -1120,6 +1120,7 @@ export default {
     },
 
     invoiceAll() {
+
       let partaIds = this.selection.map((item) => item.partaId);
       if (new Set(partaIds).size != 1) {
         return this.$message.warning('请选择相同客户的订单！');

src/views/saleManage/saleOrder/invoice/components/inventoryTable.vue

@@ -321,7 +321,7 @@
             ]"
           >
             <el-input
-              v-model="scope.row.notGenerateSendCount"
+              v-model="scope.row.saleCount"
               placeholder="请输入"
               type="number"
               :min="0"
@@ -1538,6 +1538,8 @@
           }
           item.receiveTotalWeight = item.receiveTotalWeight || 0;
 
+          item.saleCount = item.notGenerateSendCount;
+
           if (item.weightUnit == item.measuringUnit) {
             item.sendTotalWeight = item.sendTotalWeight || item.totalCount;
           } else {