新加字段 修改产品下拉选择器的弹窗

src/api/tirePartsMall/productionManagement/productionPicking/index.js

@@ -24,7 +24,7 @@ export const remove = (data) => {
 export const itemsRemove = (data) => {
   return request({
     url: '/api/blade-sales-part/shipItems/removee',
-    method: 'post',
+    method: 'get',
     params: data
   })
 }

src/components/report-dialog/main.vue

@@ -106,6 +106,9 @@ export default {
     },
     brand: {
       type: String
+    },
+    ordNo: {
+      type: String
     }
   },
   filters: {
@@ -338,6 +341,20 @@ export default {
             brand:this.searchValue.brand
           }
         });
+      }else if (name == "生产订单-领料明细.ureport.xml") {
+        this.$router.push({
+          path: `/myiframe/urlPath?name=preview-${name}&src=${this.website.reportUrl}/preview?_u=blade-${name}`,
+          query: {
+            ordNo: this.ordNo
+          }
+        });
+      }else if (name == "生产订单-组装进度.ureport.xml") {
+        this.$router.push({
+          path: `/myiframe/urlPath?name=preview-${name}&src=${this.website.reportUrl}/preview?_u=blade-${name}`,
+          query: {
+            id: this.reportId
+          }
+        });
       } else {
         let userId = JSON.parse(localStorage.getItem("saber-userInfo")).content.user_id;
         this.$router.push({

src/views/tirePartsMall/productionManagement/productionOrder/detailsPage.vue

@@ -7,7 +7,8 @@
                 </el-button>
             </div>
             <div class="add-customer-btn">
-                <el-button class="el-button--small-yh" style="margin-left: 6px;" type="primary" size="small">领料打印
+                <el-button class="el-button--small-yh" style="margin-left: 6px;" type="primary" size="small"
+                    @click="handlePrint">领料打印
                 </el-button>
                 <el-button class="el-button--small-yh" style="margin-left: 6px;" type="primary" size="small"
                     v-if="editButton" @click="inEdit">编 辑
@@ -149,8 +150,9 @@
                         </avue-crud>
                     </el-tab-pane>
                 </el-tabs>
-
             </trade-card>
+            <report-dialog :switchDialog="switchDialog" reportName="生产订单" :reportId="form.id" :ordNo="form.ordNo"
+                @onClose="onClose()"></report-dialog>
         </div>
     </div>
 </template>
@@ -163,11 +165,13 @@ import { getDicinit } from "@/api/dicSelect/index";
 import { dateFormat } from "@/util/date";
 import { contrastObj, contrastList } from "@/util/contrastData";
 import _ from "lodash";
+import reportDialog from "@/components/report-dialog/main";
 import { Header } from "element-ui";
 export default {
     name: "detailsPage",
     data() {
         return {
+            switchDialog: false, // 打印弹窗的开启和关闭
             selectPickingList: [],
             selectPickingOption: {
                 height: 300,
@@ -484,7 +488,8 @@ export default {
     },
     components: {
         dicSelect,
-        dicselectProduct
+        dicselectProduct,
+        reportDialog
     },
     props: {
         detailData: Object
@@ -501,6 +506,13 @@ export default {
         }
     },
     methods: {
+        //打印
+        handlePrint() {
+            this.switchDialog = !this.switchDialog;
+        },
+        onClose(val) {
+            this.switchDialog = val;
+        },
         dicChange(name, row) {
             if (name == 'customerName') {
                 if (row) {
@@ -515,28 +527,28 @@ export default {
                     this.form.goodsId = row.goodsId
                     this.form.goodsName = row.goodsName
                     getGoodsDetail({ id: row.id }).then(res => {
-                        res.data.data.attributeItemsList.forEach(item=>{
+                        res.data.data.attributeItemsList.forEach(item => {
                             delete item.id
                         })
-                        res.data.data.craftItemsList.forEach(item=>{
+                        res.data.data.craftItemsList.forEach(item => {
                             delete item.id
                         })
-                        res.data.data.attributeItemsList.forEach(e=>{
-                            if(e.whetherOpen == 1){
+                        res.data.data.attributeItemsList.forEach(e => {
+                            if (e.whetherOpen == 1) {
                                 this.form.attributeItemsList.push({
-                                    attributeNo:e.attributeNo,
-                                    attributeName:e.attributeName,
-                                    attributeValue:e.attributeValue,
-                                    type:e.attributeValue
+                                    attributeNo: e.attributeNo,
+                                    attributeName: e.attributeName,
+                                    attributeValue: e.attributeValue,
+                                    type: e.attributeValue
                                 })
                             }
                         })
-                        res.data.data.craftItemsList.forEach(e=>{
-                            if(e.whetherOpen == 1){
+                        res.data.data.craftItemsList.forEach(e => {
+                            if (e.whetherOpen == 1) {
                                 this.form.craftItemsList.push({
-                                    productionProcesses:e.productionProcesses,
-                                    assemblyMileageProgress:e.assemblyMileageProgress,
-                                    type:e.type
+                                    productionProcesses: e.productionProcesses,
+                                    assemblyMileageProgress: e.assemblyMileageProgress,
+                                    type: e.type
                                 })
                             }
                         })

src/views/tirePartsMall/salesManagement/saleOrder/detailsPage.vue

@@ -732,7 +732,7 @@ export default {
                         value: "dictValue"
                     },
                     value: '物流',
-                }, 
+                },
                 {
                     label: '业务公司',
                     type: 'select',
@@ -777,7 +777,13 @@ export default {
                     label: '已收金额',
                     prop: "paymentAmountTl",
                     disabled: true
-                }, {
+                },
+                {
+                    label: '发票金额',
+                    prop: 'invoiceAmount',
+                    disabled: true,
+                },
+                {
                     label: '单据编号',
                     prop: "ordNo",
                     disabled: true
@@ -1115,6 +1121,12 @@ export default {
                     disabled: true,
                 },
                 {
+                    label: '发票金额',
+                    prop: 'invoiceAmount',
+                    overHidden: true,
+                    width: 100,
+                },
+                {
                     label: '备注',
                     prop: "remarks",
                     overHidden: true,

src/views/tirePartsMall/salesManagement/saleOrder/index.vue

@@ -356,7 +356,14 @@ export default {
           label: '退货金额',
           prop: "returnsAmount",
           overHidden: true,
-        }, {
+        },
+        {
+          label: '发票金额',
+          prop: 'invoiceAmount',
+          overHidden: true,
+          width: 100,
+        },
+        {
           label: '状态',
           prop: "status",
           search: true,