【修改】bug

src/api/supply/pickup.js

@@ -111,7 +111,7 @@ export function getPickupManInfo(params) {
 // 增加打印次数
 export function addPrint(params) {
   return request({
-    url: '/pick/printAdd',
+    url: '/invoice/printInvoice',
     method: 'post',
     params
   })
@@ -142,4 +142,4 @@ export function cancelData(params) {
     method: 'post',
     params
   })
-}
+}

src/views/supply/apply/components/engin_detail.vue

@@ -37,6 +37,8 @@
             <div class="label">项目类别</div>
             <div class="value">{{detailData.refProjectName}}</div>
           </el-col>
+
+
           <el-col :span="8" class="item">
             <div class="label">工程登录类型</div>
             <div class="value">{{detailData.enginOrderType | enginTypeFilter}}</div>
@@ -49,9 +51,9 @@
             <div class="label">使用单位</div>
             <div class="value">{{detailData.refUseUnit}}</div>
           </el-col>
-          <el-col :span="8" class="item">
-            <div class="label"></div>
-            <div class="value"></div>
+           <el-col :span="8" class="item">
+            <div class="label">行业类别</div>
+            <div class="value">{{detailData.refTradeCategory}}</div>
           </el-col>
           <el-col :span="8" class="item">
             <div class="label">联系人</div>

src/views/supply/apply/components/engin_examine.vue

@@ -36,6 +36,7 @@
           <div class="label">项目类别</div>
           <div class="value">{{detailData.refProjectName}}</div>
         </el-col>
+
         <el-col :span="8" class="item">
           <div class="label">工程登录类型</div>
           <div class="value">{{detailData.enginOrderType | enginTypeFilter}}</div>
@@ -48,10 +49,10 @@
           <div class="label">使用单位</div>
           <div class="value">{{detailData.refUseUnit}}</div>
         </el-col>
-        <el-col :span="8" class="item">
-          <div class="label"></div>
-          <div class="value"></div>
-        </el-col>
+          <el-col :span="8" class="item">
+            <div class="label">行业类别</div>
+            <div class="value">{{detailData.refTradeCategory}}</div>
+          </el-col>
         <el-col :span="8" class="item">
           <div class="label">联系人</div>
           <div class="value">{{detailData.refLinkman}}</div>
@@ -64,6 +65,7 @@
           <div class="label">移动电话</div>
           <div class="value">{{detailData.refPhone}}</div>
         </el-col>
+
         <el-col :span="24" class="item">
           <div class="label">安装地址</div>
           <div class="value">{{detailData.refInstallAddress}}</div>

src/views/supply/apply/components/engin_form.vue

@@ -79,11 +79,11 @@
             <el-input v-model="mainForm.fileNo" placeholder="请输入文件编号" disabled></el-input>
           </el-form-item>
         </el-col>
-         <!-- <el-col :xs="24" :sm="12" :lg="8">
-          <el-form-item label="行业类别" prop="fileNo">
-            <el-input v-model="mainForm.fileNo" placeholder="请输入文件编号" disabled></el-input>
+         <el-col :xs="24" :sm="12" :lg="8">
+          <el-form-item label="行业类别" prop="refTradeCategory">
+            <el-input v-model="mainForm.refTradeCategory" placeholder="请输入文件编号" disabled></el-input>
           </el-form-item>
-        </el-col> -->
+        </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :xs="24" :sm="12" :lg="8">
@@ -256,9 +256,9 @@
             </template>
           </el-table-column>
           <el-table-column align="center" label="工程登录编号" prop="refEnginRecordNo" min-width="200" show-overflow-tooltip></el-table-column>
-                  <el-table-column align="center" label="表头登录类型" prop="refPromiseStatus" min-width="200" show-overflow-tooltip></el-table-column>
+                  <!-- <el-table-column align="center" label="表头登录类型" prop="refPromiseStatus" min-width="200" show-overflow-tooltip></el-table-column>
                   <el-table-column align="center" label="项目类别" prop="refProjectCategory" min-width="200" show-overflow-tooltip></el-table-column>
-                  <el-table-column align="center" label="行业类别" prop="refTradeCategory" min-width="200" show-overflow-tooltip></el-table-column>
+                  <el-table-column align="center" label="行业类别" prop="refTradeCategory" min-width="200" show-overflow-tooltip></el-table-column> -->
 
         <el-table-column align="center" label="销售类型" prop="saleTypeName" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="物料编码" prop="materialCode" min-width="120" show-overflow-tooltip></el-table-column>
@@ -362,7 +362,8 @@ export default {
         createMan: '',
         createDate: '',
         examineRemark: '',
-        refProjectName:""
+        refProjectName:"",
+        refTradeCategory:''
       },
       mainFormRules: {
         // orderDate: [{ required: true, message: '请选择单据日期', trigger: 'change' }],
@@ -470,6 +471,7 @@ export default {
         this.mainForm.fileNo = data.fileNo
         this.mainForm.refProjectName = data.refProjectName
          this.mainForm.enginName = data.refProjectCategory;
+         this.mainForm.refTradeCategory = data.refTradeCategory
         this.screenForm.warehouse = data.correspondId;
         // this.screenForm.refProjectName = data.refProjectName
         this.fileList = data.fileUrl ? [{
@@ -684,6 +686,9 @@ export default {
         this.mainForm.address = data.refInstallAddress;
         this.mainForm.remark = data.remark;
         this.mainForm.fileNo = data.fileNo
+        this.mainForm.refTradeCategory = data.refTradeCategory
+
+
       })
     },
 
@@ -719,6 +724,7 @@ export default {
             remark: this.mainForm.remark,
             enginOrderNo: this.mainForm.loginNum,
             refProjectName: this.mainForm.refProjectName,
+            refTradeCategory:this.mainForm.refTradeCategory,
             refProjectCategory:this.mainForm.enginName,
             enginOrderType: this.mainForm.loginType,
             refFactoryNo: this.mainForm.factoryNum,

src/views/supply/deliver/components/sum_print.vue

@@ -103,14 +103,22 @@ export default {
 
     // 添加次数
     addPrint() {
-      const ids = this.listItem.map(item => {
-        return item.invoiceOrderId
-      })
-        this.$parent.getList()
-      // addPrint({ ids: ids.join(',') }).then(res => {
-      //   // this.$successMsg('提交成功');
+      const ids = this.detailArr.map(item => {
+            if (item.invoicePickBeans && item.invoicePickBeans.length) {
+              for (let index = 0; index < item.invoicePickBeans.length; index++) {
+                  const element = item.invoicePickBeans[index];
+                return  item.invoiceOrderId || element.invoiceOrderId || element.id
+              }
+            }else{
+                return item.invoiceOrderId || item.id
+            }
 
-      // })
+      })
+        console.log(ids,'kkk');
+      addPrint({ ids: ids.join(',') }).then(res => {
+        // this.$successMsg('提交成功');
+         this.$parent.getList()
+      })
     }
   }
 }

src/views/supply/deliver/sum_list.vue

@@ -222,7 +222,10 @@
             <el-table-column align="left" label="项目名称" prop="refProjectName" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="表头备注" prop="remark" min-width="200" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="备注" prop="invoiceRemark" min-width="200" show-overflow-tooltip></el-table-column>
-          </el-table>
+                   <el-table-column align="left" label="打印次数" prop="printNum" min-width="200" show-overflow-tooltip></el-table-column>
+
+
+        </el-table>
         </div>
       </div>
       <div class="pagination clearfix">