ソースを参照

feat: 销售发货单增加带金额的货物签收单打印,采购订单新增核价单带出需求部门和需求人

liujt 9 ヶ月 前
コミット
1858ca890b

+ 5 - 1
src/views/purchasingManage/purchaseOrder/components/addDialog.vue

@@ -910,7 +910,11 @@
         this.$set(this.form, 'relationCode', data.inquiryCode);
         const res = await getpurchaseinquiry(data.id);
         this.$set(this.form, 'isFirstProcess', res.isFirstProcess);
-
+        this.$set(this.form, 'requireDeptId', res.requireDeptId);
+        this.$set(this.form, 'requireDeptName', res.requireDeptName);
+        this.$set(this.form, 'requireUserId', res.requireUserId);
+        this.$set(this.form, 'requireUserName', res.requireUserName);
+        this.getrequireUser(res.requireDeptId);
         let info = await getProductsBySource({
           relationId: this.form.relationId,
           relationType: this.form.relationType,

+ 2 - 2
src/views/saleManage/saleOrder/index.vue

@@ -94,7 +94,7 @@
                   apiUrl="/eom/saleorder/export"
                   :params="params"
                 ></exportButton>
-                <el-button
+                <!-- <el-button
                   :disabled="selection?.length === 0"
                   type="primary"
                   size="small"
@@ -102,7 +102,7 @@
                   @click="handlePrint()"
                   v-if="$hasPermission('eom:saleorder:print')"
                   >打印</el-button
-                >
+                > -->
               </template>
                 
               <!-- 查看详情列 -->

+ 12 - 3
src/views/saleManage/saleOrder/invoice/components/print-template-ht.vue

@@ -23,7 +23,7 @@
             width: 400px;
             margin: 0 auto;
           "
-          >{{ groupName }}货物签收单</div
+          >{{ groupName }}{{ isPrintPrice ? '货物销售单' : '货物签收单' }}</div
         >
       </div>
       <div
@@ -67,6 +67,9 @@
             <td style="padding: 5px"> 规格型号 </td>
             <td style="padding: 5px; width: 60px"> 单位</td>
             <td style="padding: 5px; width: 110px"> 数量</td>
+            <td style="padding: 5px; width: 110px" v-if="isPrintPrice"> 单价</td>
+            <td style="padding: 5px; width: 110px" v-if="isPrintPrice"> 税率</td>
+            <td style="padding: 5px; width: 110px" v-if="isPrintPrice"> 金额</td>
             <td style="padding: 5px"> 颜色 </td>
             <td style="padding: 5px"> 型号 </td>
             <td style="padding: 5px"> 备注</td>
@@ -79,6 +82,9 @@
             </td>
             <td style="padding: 5px"> {{ item.measuringUnit }}</td>
             <td style="padding: 5px"> {{ item.totalCount }}</td>
+            <td style="padding: 5px;" v-if="isPrintPrice"> {{ item.singlePrice }}</td>
+            <td style="padding: 5px;" v-if="isPrintPrice"> {{ item.taxRate }}</td>
+            <td style="padding: 5px;" v-if="isPrintPrice"> {{ item.totalPrice }}</td>
             <td style="padding: 5px"> {{ item.colorKey }}</td>
             <td style="padding: 5px"> {{ item.modelKey }}</td>
             <td style="padding: 5px"> {{ item.remark }}</td>
@@ -87,6 +93,9 @@
             <td style="padding: 5px"> 合计 </td>
             <td style="padding: 5px" colspan="2">  </td>
             <td style="padding: 5px">{{ getTotalValue('totalCount', 2) }} </td>
+            <td style="padding: 5px" v-if="isPrintPrice"> </td>
+            <td style="padding: 5px" v-if="isPrintPrice"> </td>
+            <td style="padding: 5px" v-if="isPrintPrice"> {{ getTotalValue('totalPrice', 2) }} </td>
             <td style="padding: 5px"> </td>
             <td style="padding: 5px"> </td>
             <td style="padding: 5px"> </td>
@@ -157,10 +166,10 @@
     },
 
     methods: {
-      async open(id) {
+      async open(id, isPrintPrice) {
         this.formData = await getSendSaleOrderrecordDetailSplit(id);
         this.QRvisible = true;
-
+        this.isPrintPrice = isPrintPrice;
         //包装维度
       },
       close() {

+ 1 - 1
src/views/saleManage/saleOrder/invoice/index.vue

@@ -551,7 +551,7 @@
         );
         if (!flag)
           return this.$message.warning('抱歉需要已审核的发货单才能打印,请检查');
-        if (ref != 'printTemplateByRef') {
+        if (ref != 'printTemplateByRef' && ref != 'printTemplateHtRef') {
           this.$refs[ref].open(this.selection[0].id);
           return;
         }