Merge tag 'Hotfix-zh-132' into develop

Finish Hotfix-zh-132

src/api/supply/pickup.js

@@ -109,13 +109,21 @@ export function getPickupManInfo(params) {
 }
 
 // 增加打印次数
-export function addPrint(params) {
+export function addPrints(params) {
   return request({
     url: '/invoice/printInvoice',
     method: 'post',
     params
   })
 }
+// 增加打印次数
+export function addPrint(params) {
+  return request({
+    url: '/pick/printAdd',
+    method: 'post',
+    params
+  })
+}
 
 // 获取汇总
 export function getStatistics(params) {

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

@@ -43,8 +43,8 @@
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="24" :lg="24">
-          <el-form-item label="备注" prop="remark">
-            <el-input v-model="mainForm.remark" placeholder="请输入备注"></el-input>
+          <el-form-item label="备注" prop="headerRemark">
+            <el-input v-model="mainForm.headerheaderRemark" placeholder="请输入备注"></el-input>
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="8" :lg="8">
@@ -85,9 +85,9 @@
         </el-table-column>
         <el-table-column align="center" label="已申请数量" prop="alreadyInvoiceNum" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="未申请数量" prop="canApply" min-width="100" show-overflow-tooltip> </el-table-column>
-        <el-table-column align="center" label="备注" prop="remark" min-width="160" show-overflow-tooltip>
+        <el-table-column align="center" label="备注" prop="headerRemark" min-width="160" show-overflow-tooltip>
           <template slot-scope="scope">
-            <el-input v-model="scope.row.remark" size="small"></el-input>
+            <el-input v-model="scope.row.headerRemark" size="small"></el-input>
           </template>
         </el-table-column>
         <el-table-column align="center" label="操作" width="100" fixed="right">
@@ -222,7 +222,7 @@ export default {
         date: '',
         jxsNum: '',
         jxsName: '',
-        remark: '',
+        headerRemark: '',
         createMan: '',
       },
       mainFormRules: {
@@ -279,7 +279,7 @@ export default {
         this.mainForm.jxsNum = data.customerNumber;
         this.mainForm.jxsName = data.customerName;
         this.mainForm.createMan = data.createBy;
-        this.mainForm.remark = data.remark;
+        this.mainForm.headerRemark = data.headerRemark;
         this.screenForm.warehouse = data.correspondId;
         this.fileList = data.fileUrl ? [{
           url: data.fileUrl,
@@ -482,7 +482,8 @@ export default {
           let correspondName = this.warehouseList[findElem(this.warehouseList, 'id', this.screenForm.warehouse)].name;
           let params = {
             id: this.listItem ? this.listItem.id : '',
-            remark: this.mainForm.remark,
+            headerRemark: this.mainForm.headerRemark,
+            remark:this.mainForm.headerRemark,
             fileUrl: this.fileList && this.fileList.length > 0 ? this.fileList[0].url : '',
             fileName: this.fileList && this.fileList.length > 0 ? this.fileList[0].name : '',
             // orderType: 1, // 1零售单 2家用工程 3商用工程

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

@@ -84,6 +84,11 @@
             <el-input v-model="mainForm.refTradeCategory" placeholder="请输入文件编号" disabled></el-input>
           </el-form-item>
         </el-col>
+          <!-- <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-row>
       <el-row :gutter="20">
         <el-col :xs="24" :sm="12" :lg="8">

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

@@ -28,7 +28,7 @@
 <script>
 import print from 'vue-print-nb'
 import { getDeliverDetail } from '@/api/supply/deliver'
-import { addPrint } from '@/api/supply/pickup'
+import { addPrints } from '@/api/supply/pickup'
 import { getCompanyList } from '@/api/user'
 import PrintCommon from '@/components/Common/print-common'
 import PrintFoshan from '@/components/Common/print-foshan'
@@ -116,7 +116,7 @@ export default {
       })
 
       // console.log(document.execCommand('print'),'4545');
-      addPrint({ ids: ids.join(',') }).then(res => {
+      addPrints({ ids: ids.join(',') }).then(res => {
         // this.$successMsg('提交成功');
          this.$parent.getList()
       })