Finish Hotfix-mo-115

src/components/Common/print-common.vue

@@ -0,0 +1,310 @@
+<template>
+  <div class="detail-container">
+    <div class="print-page" v-for="(item, index) in showData" :key="index">
+      <div class="print-title">
+        <div class="title1">{{company}}{{ item.type === 2 ? '销售退货单':'销售发货单' }}</div>
+      </div>
+      <div class="print-form-1">
+        <el-row :gutter="0">
+          <el-col :span="12" class="item">
+            <div class="label">经销商编码：</div>
+            <div class="value">{{ item.customerId }}</div>
+          </el-col>
+          <el-col :span="12" class="item">
+            <div class="label">打印日期：</div>
+            <div class="value">{{nowDate}}</div>
+          </el-col>
+          <el-col :span="12" class="item">
+            <div class="label">经销商：</div>
+            <div class="value">{{ item.customerName }}</div>
+          </el-col>
+          <el-col :span="12" class="item">
+            <div class="label">仓库：</div>
+            <div class="value">{{ item.correspondName }}</div>
+          </el-col>
+        </el-row>
+      </div>
+
+      <div class="print-table-1">
+        <div class="head">
+          <el-row :gutter="20">
+            <el-col :span="2">出库单号</el-col>
+            <el-col :span="2">发货单号</el-col>
+            <el-col :span="2">发货日期</el-col>
+            <el-col :span="2">订单号</el-col>
+            <el-col :span="2">工程编号</el-col>
+            <el-col :span="4">存货名称</el-col>
+            <el-col :span="8">规格型号</el-col>
+            <el-col :span="2">数量</el-col>
+          </el-row>
+        </div>
+        <div class="body">
+          <div v-for="(it, idx) in item.invoicePickBeans" :key="idx">
+            <el-row :gutter="20">
+              <el-col :span="2">{{ it.salesId }}</el-col>
+              <el-col :span="2">{{ it.id ? item.id : '' }}</el-col>
+              <el-col :span="2">{{ it.id ? dateToDayFilter(item.orderTime) : '' }}</el-col>
+              <el-col :span="2">{{ it.mainOrderId }}</el-col>
+              <el-col :span="2">{{ it.refEnginRecordNo }}</el-col>
+              <el-col :span="4">{{ it.materialName }}</el-col>
+              <el-col :span="8">{{ it.specification }}</el-col>
+              <el-col :span="2">{{ it.refundableQty }}</el-col>
+            </el-row>
+          </div>
+        </div>
+        <div class="foot">
+          <el-row :gutter="20">
+            <el-col :span="22"></el-col>
+            <el-col :span="2">{{ item.total_num }}</el-col>
+          </el-row>
+        </div>
+      </div>
+
+      <div class="print-form-2">
+        <el-row :gutter="30">
+          <el-col :span="8" class="item">
+            <div class="label">退货人</div>
+            <div class="value">
+              <el-input value=""></el-input>
+            </div>
+          </el-col>
+          <el-col :span="8" class="item">
+            <div class="label">联系方式</div>
+            <div class="value">
+              <el-input value=""></el-input>
+            </div>
+          </el-col>
+          <el-col :span="8" class="item">
+            <div class="label">车辆</div>
+            <div class="value">
+              <el-input value=""></el-input>
+            </div>
+          </el-col>
+          <el-col :span="8" class="item">
+            <div class="label">打单</div>
+            <div class="value">
+              <el-input v-model="item.createBy"></el-input>
+            </div>
+          </el-col>
+          <el-col :span="8" class="item">
+            <div class="label">提单</div>
+            <div class="value">
+              <el-input value=""></el-input>
+            </div>
+          </el-col>
+          <el-col :span="8" class="item">
+            <div class="label">仓库</div>
+            <div class="value">
+              <el-input value=""></el-input>
+            </div>
+          </el-col>
+        </el-row>
+      </div>
+
+    </div>
+
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: 'PrintFoshan',
+  props: {
+    detailData: {
+      type: Object,
+      default: null
+    },
+    company: {
+      type: String,
+      default: ''
+    }
+  },
+
+  computed: {
+    showData() {
+      var showData = [];
+      if(this.detailData && this.detailData.invoicePickBeans) {
+        for(var i=0; i<this.detailData.invoicePickBeans.length; i+=5){
+          let obj = JSON.parse(JSON.stringify(this.detailData));
+          obj.userName = JSON.parse(localStorage.getItem("supply_user")).nickName;
+          obj.invoicePickBeans = this.detailData.invoicePickBeans.slice(i, i+5);
+          obj.total_num = 0;
+          obj.total_price = 0;
+          obj.total_amount = 0;
+          obj.total_discount = 0;
+          obj.invoicePickBeans.forEach(item => {
+            obj.total_num = obj.total_num + item.refundableQty;
+          });
+          for(var j=0; j<5; j++){
+            if(!obj.invoicePickBeans[j]) {
+              obj.invoicePickBeans[j] = {};
+            }
+          }
+          showData.push(obj);
+        }
+      }
+      console.log(showData);
+      return showData;
+    },
+    
+    nowDate() {
+      var date = new Date();
+      var seperator1 = "-";
+      var year = date.getFullYear();
+      var month = date.getMonth() + 1;
+      var strDate = date.getDate();
+      if (month >= 1 && month <= 9) {
+          month = "0" + month;
+      }
+      if (strDate >= 0 && strDate <= 9) {
+          strDate = "0" + strDate;
+      }
+      var currentdate = year + seperator1 + month + seperator1 + strDate;
+      return currentdate;
+    },
+  },
+
+  methods: {
+    dateToDayFilter(date) {
+      if(!date) {return ''}
+      return date.slice(0, 10)
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+  .detail-container {
+    width: 100%;
+    height: 100%;
+  }
+  .print-page {
+    margin: 20px 0;
+    // min-height: 1020px;
+    page-break-after: always;
+  }
+  .print-title {
+    text-align: center;
+    .title1 {
+      font-size: 22px;
+      margin-bottom: 15px;
+    }
+  }
+  .print-form-1 {
+    padding-left: 10px;
+    .item {
+      display: flex;
+      padding-right: 10px;
+      .label {
+        height: 32px;
+        display: flex;
+        align-items: center;
+        box-sizing: border-box;
+        font-size: 13px;
+        color: #333333;
+        flex-shrink: 0;
+      }
+      .value {
+        flex: 1;
+        height: 32px;
+        display: flex;
+        align-items: center;
+        box-sizing: border-box;
+        font-size: 13px;
+        color: #333333;
+        input {
+          border: none;
+          padding: 0;
+        }
+      }
+    }
+  }
+  .print-table-1 {
+    font-size: 12px;
+    margin-top: 10px;
+    margin-bottom: 10px;
+    border-right: 1px solid #EBEEF5;
+    .el-row {
+      margin-left: 0 !important;
+      margin-right: 0 !important;
+      border: 1px solid #EBEEF5;
+      border-right: none;
+    }
+    .el-col {
+      padding-top: 14px;
+      padding-bottom: 14px;
+      // border-right: 1px solid #EBEEF5;
+    }
+    .head {
+      color: #909399;
+      font-weight: bold;
+      .el-col {
+        padding-right: 0 !important;
+        display: flex;
+        height: 32px;
+        align-items: center;
+      }
+    }
+    .body {
+      color: #333333;
+      .el-row {
+        border-top: none;
+      }
+      .el-col {
+        padding-right: 0 !important;
+        display: flex;
+        height: 32px;
+        align-items: center;
+        word-break: break-all;
+      }
+    }
+    .foot {
+      color: #333333;
+      .el-row {
+        border-top: none;
+      }
+      .el-col {
+        padding: 0;
+        display: flex;
+        height: 32px;
+        align-items: center;
+        word-break: break-all;
+      }
+    }
+  }
+
+  .print-form-2 {
+    padding-left: 10px;
+    .item {
+      display: flex;
+      padding-right: 10px;
+      .label {
+        height: 32px;
+        display: flex;
+        align-items: center;
+        box-sizing: border-box;
+        font-size: 13px;
+        color: #333333;
+        flex-shrink: 0;
+      }
+      .value {
+        flex: 1;
+        height: 32px;
+        display: flex;
+        align-items: center;
+        box-sizing: border-box;
+        font-size: 13px;
+        color: #333333;
+        ::v-deep .el-input input {
+          height: 30px;
+          border: none;
+          border-bottom: 1px solid #EBEEF5;
+          padding: 0 10px;
+          font-size: 13px;
+        }
+      }
+    }
+  }
+
+</style>

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

@@ -1,115 +1,74 @@
 <template>
   <div class="detail-container">
-    <el-page-header @back="goBack" content="详情"></el-page-header>
+    <div v-show="!isShowPrint">
+      <el-page-header @back="goBack" content="详情"></el-page-header>
 
-    <div class="main-title">
-      <div class="title">发货申请单信息</div>
-    </div>
+      <div class="main-title">
+        <div class="title">发货申请单信息</div>
+      </div>
 
-    <div class="diy-table-1">
-      <el-row>
-        <el-col :span="8" class="item">
-          <div class="label">发货申请单号</div>
-          <div class="value">{{detailData.id}}</div>
-        </el-col>
-        <el-col :span="8" class="item">
-          <div class="label">申请日期</div>
-          <div class="value">{{detailData.createTime}}</div>
-        </el-col>
-        <el-col :span="8" class="item">
-          <div class="label">单据状态</div>
-          <div class="value">{{detailData.examineStatus | statusFilter}}</div>
-        </el-col>
-        <el-col :span="8" class="item">
-          <div class="label">经销商编号</div>
-          <div class="value">{{detailData.customerNumber}}</div>
-        </el-col>
-        <el-col :span="16" class="item">
-          <div class="label">经销商名称</div>
-          <div class="value">{{detailData.customerName}}</div>
-        </el-col>
-        <el-col :span="8" class="item">
-          <div class="label">仓库</div>
-          <div class="value">{{detailData.correspondName}}</div>
-        </el-col>
-        <el-col :span="16" class="item">
-          <div class="label">备注</div>
-          <div class="value">{{detailData.remark}}</div>
-        </el-col>
-        <el-col :span="24" class="item file">
-          <div class="label">附件</div>
-          <div class="value">
-            <div class="file-list" v-if="detailData.fileUrl">
-              <div class="file-item">
-                <el-image v-if="checkFileType(detailData.fileUrl) == 'image'" class="img" :src="imageURL + detailData.fileUrl" :preview-src-list="[imageURL + detailData.fileUrl]"></el-image>
-                <div v-else class="box2" @click="openLink(detailData.fileUrl)">
-                  <img src="@/assets/common/word.png" v-if="checkFileType(detailData.fileUrl) == 'word'" />
-                  <img src="@/assets/common/excel.png" v-if="checkFileType(detailData.fileUrl) == 'excel'" />
-                  <img src="@/assets/common/ppt.png" v-if="checkFileType(detailData.fileUrl) == 'ppt'" />
-                  <img src="@/assets/common/pdf.png" v-if="checkFileType(detailData.fileUrl) == 'pdf'" />
-                  <div class="name ellipsis-3">{{ detailData.fileName }}</div>
+      <div class="diy-table-1">
+        <el-row>
+          <el-col :span="8" class="item">
+            <div class="label">发货申请单号</div>
+            <div class="value">{{detailData.id}}</div>
+          </el-col>
+          <el-col :span="8" class="item">
+            <div class="label">申请日期</div>
+            <div class="value">{{detailData.createTime}}</div>
+          </el-col>
+          <el-col :span="8" class="item">
+            <div class="label">单据状态</div>
+            <div class="value">{{detailData.examineStatus | statusFilter}}</div>
+          </el-col>
+          <el-col :span="8" class="item">
+            <div class="label">经销商编号</div>
+            <div class="value">{{detailData.customerNumber}}</div>
+          </el-col>
+          <el-col :span="16" class="item">
+            <div class="label">经销商名称</div>
+            <div class="value">{{detailData.customerName}}</div>
+          </el-col>
+          <el-col :span="8" class="item">
+            <div class="label">仓库</div>
+            <div class="value">{{detailData.correspondName}}</div>
+          </el-col>
+          <el-col :span="16" class="item">
+            <div class="label">备注</div>
+            <div class="value">{{detailData.remark}}</div>
+          </el-col>
+          <el-col :span="24" class="item file">
+            <div class="label">附件</div>
+            <div class="value">
+              <div class="file-list" v-if="detailData.fileUrl">
+                <div class="file-item">
+                  <el-image v-if="checkFileType(detailData.fileUrl) == 'image'" class="img" :src="imageURL + detailData.fileUrl" :preview-src-list="[imageURL + detailData.fileUrl]"></el-image>
+                  <div v-else class="box2" @click="openLink(detailData.fileUrl)">
+                    <img src="@/assets/common/word.png" v-if="checkFileType(detailData.fileUrl) == 'word'" />
+                    <img src="@/assets/common/excel.png" v-if="checkFileType(detailData.fileUrl) == 'excel'" />
+                    <img src="@/assets/common/ppt.png" v-if="checkFileType(detailData.fileUrl) == 'ppt'" />
+                    <img src="@/assets/common/pdf.png" v-if="checkFileType(detailData.fileUrl) == 'pdf'" />
+                    <div class="name ellipsis-3">{{ detailData.fileName }}</div>
+                  </div>
                 </div>
               </div>
             </div>
-          </div>
-        </el-col>
-        <el-col :span="6" class="item">
-          <div class="label">制单人</div>
-          <div class="value">{{detailData.createBy}}</div>
-        </el-col>
-        <el-col :span="6" class="item">
-          <div class="label">制单日期</div>
-          <div class="value">{{detailData.createTime}}</div>
-        </el-col>
-        <el-col :span="6" class="item">
-          <div class="label">审核人</div>
-          <div class="value">{{detailData.approvalName}}</div>
-        </el-col>
-        <el-col :span="6" class="item">
-          <div class="label">审核日期</div>
-          <div class="value">{{detailData.approvalTime}}</div>
-        </el-col>
-        <el-col :span="24" class="item">
-          <div class="label">审批说明</div>
-          <div class="value">{{detailData.approvalRemark}}</div>
-        </el-col>
-      </el-row>
-    </div>
-
-    <div class="main-title">
-      <div class="title">货品信息</div>
-    </div>
-
-    <div class="table" style="margin-top: 20px">
-      <el-table :data="detailData.orders" element-loading-text="Loading" border fit highlight-current-row stripe max-height="400">
-        <el-table-column align="center" label="序号" type="index" width="50"></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="mainOrderId" min-width="140" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="物料编码" prop="materialCode" min-width="120" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="产品编码" prop="materialOldNumber" min-width="120" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="计量单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="申请数量" prop="invoiceNum" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="审批数量" prop="approvalNumber" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="已退数量" prop="retiredQty" 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>
-      </el-table>
-    </div>
-
-    <div v-if="isExamine">
-      <div class="main-title">
-        <div class="title">审批记录</div>
-      </div>
-      <div class="diy-table-1">
-        <el-row :gutter="0">
-          <el-col :span="12" class="item">
-            <div class="label">审批人</div>
+          </el-col>
+          <el-col :span="6" class="item">
+            <div class="label">制单人</div>
+            <div class="value">{{detailData.createBy}}</div>
+          </el-col>
+          <el-col :span="6" class="item">
+            <div class="label">制单日期</div>
+            <div class="value">{{detailData.createTime}}</div>
+          </el-col>
+          <el-col :span="6" class="item">
+            <div class="label">审核人</div>
             <div class="value">{{detailData.approvalName}}</div>
           </el-col>
-          <el-col :span="12" class="item">
-            <div class="label">审批结果</div>
-            <div class="value">{{detailData.examineStatus | statusFilter}}</div>
+          <el-col :span="6" class="item">
+            <div class="label">审核日期</div>
+            <div class="value">{{detailData.approvalTime}}</div>
           </el-col>
           <el-col :span="24" class="item">
             <div class="label">审批说明</div>
@@ -117,27 +76,78 @@
           </el-col>
         </el-row>
       </div>
-    </div>
-    
-    <div class="page-footer">
-      <div class="footer">
-        <el-popconfirm title="确定关闭吗？" @onConfirm="goBack" style="margin-left: 10px;">
-          <el-button slot="reference">关 闭</el-button>
-        </el-popconfirm>
+
+      <div class="main-title">
+        <div class="title">货品信息</div>
+      </div>
+
+      <div class="table" style="margin-top: 20px">
+        <el-table :data="detailData.orders" element-loading-text="Loading" border fit highlight-current-row stripe max-height="400">
+          <el-table-column align="center" label="序号" type="index" width="50"></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="mainOrderId" min-width="140" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="物料编码" prop="materialCode" min-width="120" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="产品编码" prop="materialOldNumber" min-width="120" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="计量单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="申请数量" prop="invoiceNum" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="审批数量" prop="approvalNumber" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="已退数量" prop="retiredQty" 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>
+        </el-table>
       </div>
+
+      <div v-if="isExamine">
+        <div class="main-title">
+          <div class="title">审批记录</div>
+        </div>
+        <div class="diy-table-1">
+          <el-row :gutter="0">
+            <el-col :span="12" class="item">
+              <div class="label">审批人</div>
+              <div class="value">{{detailData.approvalName}}</div>
+            </el-col>
+            <el-col :span="12" class="item">
+              <div class="label">审批结果</div>
+              <div class="value">{{detailData.examineStatus | statusFilter}}</div>
+            </el-col>
+            <el-col :span="24" class="item">
+              <div class="label">审批说明</div>
+              <div class="value">{{detailData.approvalRemark}}</div>
+            </el-col>
+          </el-row>
+        </div>
+      </div>
+      
+      <div class="page-footer">
+        <div class="footer">
+          <el-button  type="primary" icon="el-icon-printer" @click="toPrint" :disabled="detailData.examineStatus !== 'OK'">打 印</el-button>
+          <el-popconfirm title="确定关闭吗？" @onConfirm="goBack" style="margin-left: 10px;">
+            <el-button slot="reference">关 闭</el-button>
+          </el-popconfirm>
+        </div>
+      </div>
+    
     </div>
 
+    <CommonPrint :printId="printId" :printType="printType" v-if="isShowPrint" @backDetail="backDetail" />
+
   </div>
 </template>
 
 <script>
 import { getApplyDetail } from "@/api/supply/apply";
 import { getFileUrl } from '@/api/common';
+import CommonPrint from "@/views/supply/deliver/components/common_print";
 
 export default {
   name: 'ApplyDetail',
   componentName: 'ApplyDetail',
   props: ['listItem'],
+  components: {
+    CommonPrint,
+  },
   filters: {
     statusFilter(val) {
       const statusList = [
@@ -155,6 +165,9 @@ export default {
     return {
       imageURL: this.$imageUrl,
       detailData: {},
+      printType: 1,
+      printId: '',
+      isShowPrint: false,
     }
   },
 
@@ -208,6 +221,17 @@ export default {
       })
     },
 
+    // 点击打印
+    toPrint() {
+      this.printId = this.listItem.id;
+      this.isShowPrint = true;
+    },
+
+    backDetail() {
+      this.printId = '';
+      this.isShowPrint = false;
+    },
+
   }
 }
 </script>

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

@@ -304,9 +304,6 @@ export default {
     },
 
     getDictList() {
-      // getDictList({sysDictEnum: 'PRODUCT_TYPE'}).then(res => {
-      //   this.typeList = res.data;
-      // })
       getDictList({sysDictEnum: 'STOCK_ORDER'}).then(res => {
         this.stockList = res.data;
       })
@@ -421,24 +418,6 @@ export default {
       this.isShowDialog = false;
     },
 
-    // 数组去重
-    delRepeat(arr1, arr2) {
-      let allArr = arr1.concat(arr2); // 两个数组对象合并
-      let newArr = []; // 存放去重后数据的新数组
-      for(let i=0; i<allArr.length; i++){  // 循环allArr数组对象的内容
-        let flag = true;  // 建立标记，判断数据是否重复，true为不重复
-        for(let j=0; j<newArr.length; j++){  // 循环新数组的内容
-          if(allArr[i].orderId == newArr[j].orderId){ // 让allArr数组对象的内容与新数组的内容作比较，相同的话，改变标记为false
-            flag = false;
-          }
-        }
-        if(flag){ // 判断是否重复
-          newArr.push(allArr[i]); // 不重复的放入新数组。  新数组的内容会继续进行上边的循环。
-        }
-      }
-      return newArr;
-    },
-
     // 确定 添加产品
     submitAddGoods() {
       let tableSelection = [];
@@ -453,26 +432,12 @@ export default {
           this.$errorMsg('申请数量要大于0');
           return;
         }
-        if(tableSelection[i].invoiceNum > tableSelection[i].refundableQty) {
-          this.$errorMsg('申请数量不能大于未申请数量');
-          return;
-        }
+        // if(tableSelection[i].invoiceNum > tableSelection[i].refundableQty) {
+        //   this.$errorMsg('申请数量不能大于未申请数量');
+        //   return;
+        // }
       }
 
-      // let allList = this.tableGoodsList;
-      // let selectList = tableSelection;
-      // let submitList = [];
-
-      // for(let i = 0; i < allList.length; i++) {
-      //   for(let j = 0; j < selectList.length; j++) {
-      //     if(selectList[j].orderId == allList[i].orderId){
-      //       submitList.push(allList[i]);
-      //     }
-      //   }
-      // }
-      // this.goodsList = this.goodsList.concat(submitList);
-
-      // this.goodsList = this.delRepeat(submitList, this.goodsList);
       this.isShowDialog = false;
       this.tableGoodsList = [];
 
@@ -482,9 +447,6 @@ export default {
     // 删除产品
     deleteItem(index) {
       this.goodsList.splice(index, 1);
-      // this.goodsList = this.goodsList.filter((item) => {
-      //   return item.orderId != id
-      // })
     },
 
     // 保存
@@ -499,10 +461,10 @@ export default {
               this.$errorMsg('请输入申请数量');
               return;
             }
-            if(this.goodsList[i].invoiceNum > this.goodsList[i].refundableQty) {
-              this.$errorMsg('申请数量不能大于未申请数量');
-              return;
-            }
+            // if(this.goodsList[i].invoiceNum > this.goodsList[i].refundableQty) {
+            //   this.$errorMsg('申请数量不能大于未申请数量');
+            //   return;
+            // }
           }
           if(!this.screenForm.warehouse) {
             return this.$errorMsg('请选择仓库');
@@ -511,7 +473,6 @@ export default {
           let correspondName = this.warehouseList[findElem(this.warehouseList, 'id', this.screenForm.warehouse)].name;
           let params = {
             id: this.listItem ? this.listItem.id : '',
-            // orderTime: this.mainForm.date + ' 00:00:00',
             remark: this.mainForm.remark,
             fileUrl: this.fileList && this.fileList.length > 0 ? this.fileList[0].url : '',
             fileName: this.fileList && this.fileList.length > 0 ? this.fileList[0].name : '',

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

@@ -1,151 +1,110 @@
 <template>
   <div class="detail-container">
-    <el-page-header @back="goBack" content="详情"></el-page-header>
+    <div v-show="!isShowPrint">
+      <el-page-header @back="goBack" content="详情"></el-page-header>
 
-    <div class="main-title">
-      <div class="title">工程发货申请单信息</div>
-    </div>
+      <div class="main-title">
+        <div class="title">工程发货申请单信息</div>
+      </div>
 
-    <div class="diy-table-1">
-      <el-row>
-        <el-col :span="8" class="item">
-          <div class="label">发货申请单号</div>
-          <div class="value">{{detailData.id}}</div>
-        </el-col>
-        <el-col :span="8" class="item">
-          <div class="label">申请日期</div>
-          <div class="value">{{detailData.createTime}}</div>
-        </el-col>
-        <el-col :span="8" class="item">
-          <div class="label">单据状态</div>
-          <div class="value">{{detailData.examineStatus | statusFilter}}</div>
-        </el-col>
-        <el-col :span="8" class="item">
-          <div class="label">经销商编号</div>
-          <div class="value">{{detailData.customerNumber}}</div>
-        </el-col>
-        <el-col :span="16" class="item">
-          <div class="label">经销商名称</div>
-          <div class="value">{{detailData.customerName}}</div>
-        </el-col>
-        <el-col :span="8" class="item">
-          <div class="label">工程登录编号</div>
-          <div class="value">{{detailData.refEnginRecordNo}}</div>
-        </el-col>
-        <el-col :span="8" class="item">
-          <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>
-        </el-col>
-        <el-col :span="8" class="item">
-          <div class="label">厂工程编号</div>
-          <div class="value">{{detailData.refFactoryNo}}</div>
-        </el-col>
-        <el-col :span="8" class="item">
-          <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.refLinkman}}</div>
-        </el-col>
-        <el-col :span="8" class="item">
-          <div class="label">固定电话</div>
-          <div class="value">{{detailData.refTel}}</div>
-        </el-col>
-        <el-col :span="8" class="item">
-          <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>
-        </el-col>
-        <el-col :span="24" class="item">
-          <div class="label">备注</div>
-          <div class="value">{{detailData.remark}}</div>
-        </el-col>
-        <el-col :span="24" class="item file">
-          <div class="label">附件</div>
-          <div class="value">
-            <div class="file-list" v-if="detailData.fileUrl">
-              <div class="file-item">
-                <el-image v-if="checkFileType(detailData.fileUrl) == 'image'" class="img" :src="imageURL + detailData.fileUrl" :preview-src-list="[imageURL + detailData.fileUrl]"></el-image>
-                <div v-else class="box2" @click="openLink(detailData.fileUrl)">
-                  <img src="@/assets/common/word.png" v-if="checkFileType(detailData.fileUrl) == 'word'" />
-                  <img src="@/assets/common/excel.png" v-if="checkFileType(detailData.fileUrl) == 'excel'" />
-                  <img src="@/assets/common/ppt.png" v-if="checkFileType(detailData.fileUrl) == 'ppt'" />
-                  <img src="@/assets/common/pdf.png" v-if="checkFileType(detailData.fileUrl) == 'pdf'" />
-                  <div class="name ellipsis-3">{{ detailData.fileName }}</div>
+      <div class="diy-table-1">
+        <el-row>
+          <el-col :span="8" class="item">
+            <div class="label">发货申请单号</div>
+            <div class="value">{{detailData.id}}</div>
+          </el-col>
+          <el-col :span="8" class="item">
+            <div class="label">申请日期</div>
+            <div class="value">{{detailData.createTime}}</div>
+          </el-col>
+          <el-col :span="8" class="item">
+            <div class="label">单据状态</div>
+            <div class="value">{{detailData.examineStatus | statusFilter}}</div>
+          </el-col>
+          <el-col :span="8" class="item">
+            <div class="label">经销商编号</div>
+            <div class="value">{{detailData.customerNumber}}</div>
+          </el-col>
+          <el-col :span="16" class="item">
+            <div class="label">经销商名称</div>
+            <div class="value">{{detailData.customerName}}</div>
+          </el-col>
+          <el-col :span="8" class="item">
+            <div class="label">工程登录编号</div>
+            <div class="value">{{detailData.refEnginRecordNo}}</div>
+          </el-col>
+          <el-col :span="8" class="item">
+            <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>
+          </el-col>
+          <el-col :span="8" class="item">
+            <div class="label">厂工程编号</div>
+            <div class="value">{{detailData.refFactoryNo}}</div>
+          </el-col>
+          <el-col :span="8" class="item">
+            <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.refLinkman}}</div>
+          </el-col>
+          <el-col :span="8" class="item">
+            <div class="label">固定电话</div>
+            <div class="value">{{detailData.refTel}}</div>
+          </el-col>
+          <el-col :span="8" class="item">
+            <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>
+          </el-col>
+          <el-col :span="24" class="item">
+            <div class="label">备注</div>
+            <div class="value">{{detailData.remark}}</div>
+          </el-col>
+          <el-col :span="24" class="item file">
+            <div class="label">附件</div>
+            <div class="value">
+              <div class="file-list" v-if="detailData.fileUrl">
+                <div class="file-item">
+                  <el-image v-if="checkFileType(detailData.fileUrl) == 'image'" class="img" :src="imageURL + detailData.fileUrl" :preview-src-list="[imageURL + detailData.fileUrl]"></el-image>
+                  <div v-else class="box2" @click="openLink(detailData.fileUrl)">
+                    <img src="@/assets/common/word.png" v-if="checkFileType(detailData.fileUrl) == 'word'" />
+                    <img src="@/assets/common/excel.png" v-if="checkFileType(detailData.fileUrl) == 'excel'" />
+                    <img src="@/assets/common/ppt.png" v-if="checkFileType(detailData.fileUrl) == 'ppt'" />
+                    <img src="@/assets/common/pdf.png" v-if="checkFileType(detailData.fileUrl) == 'pdf'" />
+                    <div class="name ellipsis-3">{{ detailData.fileName }}</div>
+                  </div>
                 </div>
               </div>
             </div>
-          </div>
-        </el-col>
-        <el-col :span="6" class="item">
-          <div class="label">制单人</div>
-          <div class="value">{{detailData.createBy}}</div>
-        </el-col>
-        <el-col :span="6" class="item">
-          <div class="label">制单日期</div>
-          <div class="value">{{detailData.createTime}}</div>
-        </el-col>
-        <el-col :span="6" class="item">
-          <div class="label">审核人</div>
-          <div class="value">{{detailData.approvalName}}</div>
-        </el-col>
-        <el-col :span="6" class="item">
-          <div class="label">审核日期</div>
-          <div class="value">{{detailData.approvalTime}}</div>
-        </el-col>
-        <el-col :span="24" class="item">
-          <div class="label">审批说明</div>
-          <div class="value">{{detailData.approvalRemark}}</div>
-        </el-col>
-      </el-row>
-    </div>
-
-    <div class="main-title">
-      <div class="title">货品信息</div>
-    </div>
-
-    <div class="table" style="margin-top: 20px">
-      <el-table :data="detailData.orders" element-loading-text="Loading" border fit highlight-current-row stripe max-height="400">
-        <el-table-column align="center" label="序号" type="index" width="50"></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="theTime" min-width="160" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="销售订单号" prop="enginOrderNo" min-width="180" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="物料编码" prop="materialCode" min-width="120" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="产品编码" prop="materialOldNumber" min-width="120" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="申请数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="审批数量" prop="approvalNumber" 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>
-      </el-table>
-    </div>
-
-    <div v-if="isExamine">
-      <div class="main-title">
-        <div class="title">审批记录</div>
-      </div>
-      <div class="diy-table-1">
-        <el-row :gutter="0">
-          <el-col :span="12" class="item">
-            <div class="label">审批人</div>
+          </el-col>
+          <el-col :span="6" class="item">
+            <div class="label">制单人</div>
+            <div class="value">{{detailData.createBy}}</div>
+          </el-col>
+          <el-col :span="6" class="item">
+            <div class="label">制单日期</div>
+            <div class="value">{{detailData.createTime}}</div>
+          </el-col>
+          <el-col :span="6" class="item">
+            <div class="label">审核人</div>
             <div class="value">{{detailData.approvalName}}</div>
           </el-col>
-          <el-col :span="12" class="item">
-            <div class="label">审批结果</div>
-            <div class="value">{{detailData.examineStatus | statusFilter}}</div>
+          <el-col :span="6" class="item">
+            <div class="label">审核日期</div>
+            <div class="value">{{detailData.approvalTime}}</div>
           </el-col>
           <el-col :span="24" class="item">
             <div class="label">审批说明</div>
@@ -153,27 +112,78 @@
           </el-col>
         </el-row>
       </div>
-    </div>
-    
-    <div class="page-footer">
-      <div class="footer" :class="classObj">
-        <el-popconfirm title="确定关闭吗？" @onConfirm="goBack" style="margin-left: 10px;">
-          <el-button slot="reference">关 闭</el-button>
-        </el-popconfirm>
+
+      <div class="main-title">
+        <div class="title">货品信息</div>
+      </div>
+
+      <div class="table" style="margin-top: 20px">
+        <el-table :data="detailData.orders" element-loading-text="Loading" border fit highlight-current-row stripe max-height="400">
+          <el-table-column align="center" label="序号" type="index" width="50"></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="theTime" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="销售订单号" prop="enginOrderNo" min-width="180" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="物料编码" prop="materialCode" min-width="120" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="产品编码" prop="materialOldNumber" min-width="120" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="申请数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="审批数量" prop="approvalNumber" 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>
+        </el-table>
       </div>
+
+      <div v-if="isExamine">
+        <div class="main-title">
+          <div class="title">审批记录</div>
+        </div>
+        <div class="diy-table-1">
+          <el-row :gutter="0">
+            <el-col :span="12" class="item">
+              <div class="label">审批人</div>
+              <div class="value">{{detailData.approvalName}}</div>
+            </el-col>
+            <el-col :span="12" class="item">
+              <div class="label">审批结果</div>
+              <div class="value">{{detailData.examineStatus | statusFilter}}</div>
+            </el-col>
+            <el-col :span="24" class="item">
+              <div class="label">审批说明</div>
+              <div class="value">{{detailData.approvalRemark}}</div>
+            </el-col>
+          </el-row>
+        </div>
+      </div>
+      
+      <div class="page-footer">
+        <div class="footer">
+          <el-button  type="primary" icon="el-icon-printer" @click="toPrint" :disabled="detailData.examineStatus !== 'OK'">打 印</el-button>
+          <el-popconfirm title="确定关闭吗？" @onConfirm="goBack" style="margin-left: 10px;">
+            <el-button slot="reference">关 闭</el-button>
+          </el-popconfirm>
+        </div>
+      </div>
+
     </div>
 
+    <CommonPrint :printId="printId" :printType="printType" v-if="isShowPrint" @backDetail="backDetail" />
+
   </div>
 </template>
 
 <script>
 import { getEnginDetail } from "@/api/supply/apply";
 import { getFileUrl } from '@/api/common';
+import CommonPrint from "@/views/supply/deliver/components/common_print";
 
 export default {
   name: 'EnginDetail',
   componentName: 'EnginDetail',
   props: ['listItem'],
+  components: {
+    CommonPrint,
+  },
   filters: {
     statusFilter(val) {
       const statusList = [
@@ -198,19 +208,13 @@ export default {
     return {
       imageURL: this.$imageUrl,
       detailData: {},
+      printType: 1,
+      printId: '',
+      isShowPrint: false,
     }
   },
 
   computed: {
-    sidebar() {
-      return this.$store.state.app.sidebar
-    },
-    classObj() {
-      return {
-        hideSidebar: !this.sidebar.opened,
-        openSidebar: this.sidebar.opened
-      }
-    },
     isExamine() {
       return this.detailData.examineStatus === 'OK' || this.detailData.examineStatus === "FAIL"
     },
@@ -260,6 +264,17 @@ export default {
       })
     },
 
+    // 点击打印
+    toPrint() {
+      this.printId = this.listItem.id;
+      this.isShowPrint = true;
+    },
+
+    backDetail() {
+      this.printId = '';
+      this.isShowPrint = false;
+    },
+
   }
 }
 </script>

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

@@ -580,24 +580,6 @@ export default {
       this.tableSelection = val;
     },
 
-    // 数组去重
-    delRepeat(arr1, arr2) {
-      let allArr = arr1.concat(arr2); // 两个数组对象合并
-      let newArr = []; // 存放去重后数据的新数组
-      for(let i=0; i<allArr.length; i++){  // 循环allArr数组对象的内容
-        let flag = true;  // 建立标记，判断数据是否重复，true为不重复
-        for(let j=0; j<newArr.length; j++){  // 循环新数组的内容
-          if(allArr[i].orderId == newArr[j].orderId){ // 让allArr数组对象的内容与新数组的内容作比较，相同的话，改变标记为false
-            flag = false;
-          }
-        }
-        if(flag){ // 判断是否重复
-          newArr.push(allArr[i]); // 不重复的放入新数组。  新数组的内容会继续进行上边的循环。
-        }
-      }
-      return newArr;
-    },
-
     // 检查是否一致
     isAllEqual(array) {
       if (array.length > 0) {
@@ -621,25 +603,11 @@ export default {
           this.$errorMsg('请输入申请数量');
           return;
         }
-        if(this.tableSelection[i].invoiceNum > this.tableSelection[i].refundableQty) {
-          this.$errorMsg('申请数量不能大于未申请数量');
-          return;
-        }
+        // if(this.tableSelection[i].invoiceNum > this.tableSelection[i].refundableQty) {
+        //   this.$errorMsg('申请数量不能大于未申请数量');
+        //   return;
+        // }
       }
-
-      // let allList = this.tableGoodsList;
-      // let selectList = this.tableSelection;
-      // let submitList = [];
-
-      // for(let i = 0; i < allList.length; i++) {
-      //   for(let j = 0; j < selectList.length; j++) {
-      //     if(selectList[j].enginOrderNo == allList[i].enginOrderNo){
-      //       submitList.push(allList[i]);
-      //     }
-      //   }
-      // }
-
-      // this.goodsList = this.delRepeat(submitList, this.goodsList);
       this.isShowDialog = false;
       this.tableGoodsList = [];
 
@@ -647,7 +615,6 @@ export default {
       this.goodsList = this.goodsList.concat(this.tableSelection);
 
       this.getEnginGoodsDetail(this.tableSelection[0].enginOrderNo);
-      // this.getEnginGoodsDetail(submitList[0].enginOrderNo);
     },
 
     getEnginGoodsDetail(enginOrderNo) {
@@ -670,9 +637,6 @@ export default {
     // 删除产品
     deleteItem(index) {
       this.goodsList.splice(index, 1);
-      // this.goodsList = this.goodsList.filter((item) => {
-      //   return item.orderId != id
-      // })
     },
 
     // 保存
@@ -687,10 +651,10 @@ export default {
               this.$errorMsg('请输入申请数量');
               return;
             }
-            if(this.goodsList[i].invoiceNum > this.goodsList[i].refundableQty) {
-              this.$errorMsg('申请数量不能大于未申请数量');
-              return;
-            }
+            // if(this.goodsList[i].invoiceNum > this.goodsList[i].refundableQty) {
+            //   this.$errorMsg('申请数量不能大于未申请数量');
+            //   return;
+            // }
           }
           if(!this.screenForm.warehouse) {
             return this.$errorMsg('请选择仓库');

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

@@ -1,13 +1,14 @@
 <template>
   <div class="detail-container">
-    <div class="top-container">
+    <!-- <div class="top-container">
       <el-radio-group v-model="currentType" size="medium" @change="changeType()">
         <el-radio-button v-for="(item, index) in typeList" :key="index" :label="item.value">{{item.label}}</el-radio-button>
       </el-radio-group>
-    </div>
+    </div> -->
 
     <div id="printMe">
       
+      <PrintCommon :detailData="detailData" :company="company" v-if="currentType === 0" />
       <PrintFoshan :detailData="detailData" :company="company" v-if="currentType === 1" />
       <PrintGuangzhou :detailData="detailData" :company="company" v-if="currentType === 2" />
       <PrintShaoguan :detailData="detailData" :company="company" v-if="currentType === 3" />
@@ -29,6 +30,7 @@ import print from 'vue-print-nb'
 import { getDeliverDetail, getEnginDetail } from "@/api/supply/deliver";
 import { addPrint } from "@/api/supply/pickup";
 import { getCompanyList } from "@/api/user";
+import PrintCommon from "@/components/Common/print-common";
 import PrintFoshan from "@/components/Common/print-foshan";
 import PrintGuangzhou from "@/components/Common/print-guangzhou";
 import PrintShaoguan from "@/components/Common/print-shaoguan";
@@ -41,14 +43,16 @@ export default {
     PrintFoshan,
     PrintGuangzhou,
     PrintShaoguan,
+    PrintCommon,
   },
   directives: {
     print
   },
   data() {
     return {
-      currentType: 1,
+      currentType: 0,
       typeList: [
+        { label: '通用', value: 0 },
         { label: '佛山', value: 1 },
         { label: '广州', value: 2 },
         { label: '韶关', value: 3 },
@@ -81,15 +85,15 @@ export default {
 
     // 获取详情
     getDetail() {
-      if(this.printType === 1) {
+      // if(this.printType === 1) {
         getDeliverDetail({id: this.printId}).then(res => {
           this.detailData = res.data;
         })
-      }else {
-        getEnginDetail({id: this.printId}).then(res => {
-          this.detailData = res.data;
-        })
-      }
+      // }else {
+        // getEnginDetail({id: this.printId}).then(res => {
+          // this.detailData = res.data;
+        // })
+      // }
     },
 
     getCompanyList() {
@@ -115,6 +119,6 @@ export default {
     height: 100%;
   }
   .top-container {
-    margin-bottom: 20px;
+    margin-top: 20px;
   }
 </style>

src/views/supply/engin/components/commerce_form.vue

@@ -57,9 +57,9 @@
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">
-          <el-form-item label="工程信息单号" prop="enginNum">
+          <el-form-item label="工程信息单号" prop="enginOrderNum">
             <div style="display: flex;">
-              <el-input v-model="mainForm.enginNum" placeholder="请引用工程登录" disabled></el-input>
+              <el-input v-model="mainForm.enginOrderNum" placeholder="请引用工程登录" disabled></el-input>
               <el-button style="margin-left: 10px;" @click="openShareDetail">引用</el-button>
             </div>
           </el-form-item>
@@ -405,7 +405,7 @@ export default {
         // type: '',
         jxsNum: '',
         jxsName: '',
-        enginNum: '',
+        enginOrderNum: '',
         enginName: '',
         loginType: '',
         factoryNum: '',
@@ -429,7 +429,7 @@ export default {
         // orderDate: [{ required: true, message: '请选择单据日期', trigger: 'change' }],
         jxsNum: [{ required: true, message: '请输入经销商编码', trigger: 'blur' }],
         jxsName: [{ required: true, message: '请输入经销商名称', trigger: 'blur' }],
-        enginNum: [{ required: true, message: '请输入工程登录编号', trigger: 'blur' }],
+        enginOrderNum: [{ required: true, message: '请输入工程登录编号', trigger: 'blur' }],
         // enginName: [{ required: true, message: '请输入项目类别', trigger: 'blur' }],
         // loginType: [{ required: true, message: '请输入行业类别', trigger: 'blur' }],
         company: [{ required: true, message: '请输入使用单位', trigger: 'blur' }],
@@ -598,7 +598,7 @@ export default {
         // this.mainForm.type = data.mainId;
         this.mainForm.jxsNum = data.customerNumber;
         this.mainForm.jxsName = data.customerName;
-        this.mainForm.enginNum = data.refEnginRecordNo;
+        this.mainForm.enginOrderNum = data.refEnginRecordNo;
         this.mainForm.enginName = data.refProjectName;
         this.mainForm.loginType = data.refTradeCategory;
         this.mainForm.factoryNum = data.refFactoryNo;
@@ -686,7 +686,7 @@ export default {
         this.isShowDialog = false;
         let data = res.data;
         // this.mainForm.type = data.mainId;
-        this.mainForm.enginNum = data.enginInfoNo;
+        this.mainForm.enginOrderNum = data.enginInfoNo;
         this.mainForm.enginName = data.projectName;
         this.mainForm.loginType = data.tradeCategory;
         this.mainForm.factoryNum = data.factoryNo;
@@ -845,7 +845,7 @@ export default {
             enginOrderId: this.mainForm.orderNum,
             // orderDate: this.mainForm.orderDate,
             // mainId: this.mainForm.type || '',
-            refEnginRecordNo: this.mainForm.enginNum || '',
+            refEnginRecordNo: this.mainForm.enginOrderNum || '',
             refProjectName: this.mainForm.enginName || '',
             refTradeCategory: this.mainForm.loginType || '',
             refFactoryNo: this.mainForm.factoryNum || '',

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

@@ -48,7 +48,7 @@
       <el-row :gutter="20">
         <el-col :xs="24" :sm="12" :lg="8">
           <el-form-item label="经销商编码" prop="jxsNum">
-            <el-input v-model="mainForm.jxsNum" placeholder="请输入经销商编码" disabled></el-input>
+            <el-input v-model="mainForm.jxsNum" placeholder="请输入经销商编码"></el-input>
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">
@@ -70,7 +70,7 @@
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">
           <el-form-item label="经销商名称" prop="jxsName">
-            <el-input v-model="mainForm.jxsName" placeholder="请输入经销商名称" disabled></el-input>
+            <el-input v-model="mainForm.jxsName" placeholder="请输入经销商名称"></el-input>
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">

src/views/supply/engin/engin_list.vue

@@ -182,7 +182,7 @@
             <el-table-column align="left" label="制表日期" prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="审核人" prop="confirmBy" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="审核日期" prop="confirmTime" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="操作" width="180" fixed="right">
+            <el-table-column align="center" label="操作" width="210" fixed="right">
               <template slot-scope="scope">
                 <el-popconfirm
                   style="margin-right: 10px;"