Finish Hotfix-mo-165

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

@@ -54,6 +54,10 @@
               <div class="value">{{detailData.refUseUnit}}</div>
             </el-col>
             <el-col :span="8" class="item">
+              <div class="label">购买单位</div>
+              <div class="value">{{detailData.refBuyUnitName}}</div>
+            </el-col>
+            <el-col :span="8" class="item">
               <div class="label">区域</div>
               <div class="value">{{detailData.refRegionWork}}</div>
             </el-col>

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

@@ -57,6 +57,12 @@
           </div>
         </el-col>
         <el-col :span="8" class="item">
+          <div class="label">购买单位</div>
+          <div class="value">
+            <el-input v-model="detailData.refBuyUnitName" placeholder="请输入购买单位"></el-input>
+          </div>
+        </el-col>
+        <el-col :span="8" class="item">
           <div class="label">区域</div>
           <div class="value">{{detailData.refRegionWork}}</div>
         </el-col>
@@ -191,7 +197,9 @@
         fit
         highlight-current-row
         stripe
-        max-height="400">
+        max-height="400"
+        show-summary
+        :summary-method="$getSummaries">
         <el-table-column align="center" label="序号" type="index" width="50"></el-table-column>
         <el-table-column align="left" label="引用记录" prop="useRefCount" min-width="160" show-overflow-tooltip></el-table-column>
         <el-table-column align="left" label="销售类型" prop="saleTypeName" min-width="100" show-overflow-tooltip></el-table-column>
@@ -405,7 +413,7 @@ export default {
         if(res.data.items) {
           res.data.items.forEach(item => {
             item.sums1 = ['directTransferQty', 'qty', 'enginNum', 'refundableQty', 'tdQty', 'hasSendQty'];
-            item.sums2 = ['totalAmount', 'payAmount', 'price', 'discAmount', 'rebateAmount'];
+            item.sums2 = ['totalAmount', 'payAmount', 'price', 'discAmount', 'payRebateAmount'];
           })
         }
         res.data.items.forEach(item => {
@@ -480,6 +488,7 @@ export default {
             }).then(() => {
               this.$successMsg('进入下一张待审批订单');
               this.detailData = res.data;
+              this.examineForm.remark = '';
             }).catch(() => {
               this.goBack();
               this.$parent.getList();

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

@@ -107,8 +107,11 @@
             <el-input v-model="mainForm.fileNum" placeholder="请输入文件编号" :disabled="isDealer"></el-input>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
+        <el-col :xs="24" :sm="12" :lg="8">
+          <el-form-item label="购买单位" prop="refBuyUnitName">
+            <el-input v-model="mainForm.refBuyUnitName" placeholder="请输入购买单位" :disabled="isDealer"></el-input>
+          </el-form-item>
+        </el-col>
         <el-col :xs="24" :sm="12" :lg="8">
           <el-form-item label="联系人" prop="contactMan">
             <el-input v-model="mainForm.contactMan" placeholder="请输入联系人" :disabled="isDealer"></el-input>
@@ -522,7 +525,8 @@ export default {
         examineRemark: '',
         refCount: '',
         regionWork: '',
-        examineStatus: ''
+        examineStatus: '',
+        refBuyUnitName: '',
       },
       mainFormRules: {
         // orderDate: [{ required: true, message: '请选择单据日期', trigger: 'change' }],
@@ -899,6 +903,7 @@ export default {
         this.mainForm.loginUserId = data.loginUserId;
         this.mainForm.regionWork = data.refRegionWork;
         this.mainForm.examineStatus = data.examineStatus;
+        this.mainForm.refBuyUnitName = data.refBuyUnitName;
 
         data.items.forEach(item => {
           item.status1 = '';
@@ -1158,6 +1163,7 @@ export default {
             refProjectNote: this.mainForm.projectRemark,
             refProjectType: this.mainForm.projectType,
             refRegionWork: this.mainForm.regionWork,
+            refBuyUnitName: this.mainForm.refBuyUnitName,
             items: goodsList,
           }
 
@@ -1213,6 +1219,7 @@ export default {
       this.mainForm.projectType = data.govBuyType;
       this.mainForm.refCount = data.refCount;
       this.mainForm.regionWork = data.regionWork;
+      this.mainForm.refBuyUnitName = data.buyUnitName;
 
       let saleTypeItem = this.salesTypeList.find(o => o.id === this.mainForm.saleType);
 

src/views/supply/engin/home_list.vue

@@ -115,7 +115,7 @@
               </el-form-item>
             </el-col>
 
-            <el-col :xs="24" :sm="24" :lg="12" class="tr">
+            <el-col :xs="24" :sm="!isCustomer ? 12 : 24" :lg="!isCustomer ? 18 : 24" class="tr">
               <el-form-item label="">
                 <el-button @click="resetScreenForm">清空</el-button>
                 <el-button type="primary" @click="submitScreenForm">搜索</el-button>
@@ -167,18 +167,13 @@
                 </div>
               </template>
             </el-table-column>
+            <el-table-column align="left" label="制单日期" prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="工程登录编号" prop="refEnginRecordNo" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.refEnginRecordNo" />
                 <span>{{scope.row.refEnginRecordNo}}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="订单类型" prop="enginOrderType" min-width="100" show-overflow-tooltip>
-              <template slot-scope="scope">
-                {{scope.row.enginOrderType | typeFilter}}
-              </template>
-            </el-table-column>
-            <el-table-column align="left" label="使用单位" prop="refUseUnit" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="行业类别" prop="refTradeCategory" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column v-if="!isCustomer" align="left" label="格力内部备注" prop="geLiInerNote" min-width="160" show-overflow-tooltip></el-table-column>
@@ -211,13 +206,6 @@
             </el-table-column>
             <el-table-column align="left" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="right" label="总数量" prop="qty" min-width="100" sortable show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="是否直调" prop="isDirectTransfer" min-width="100" show-overflow-tooltip>
-              <template slot-scope="scope">
-                {{scope.row.isDirectTransfer ? '是':'否'}}
-              </template>
-            </el-table-column>
-            <el-table-column align="right" label="直调数量" prop="directTransferQty" min-width="110" sortable show-overflow-tooltip></el-table-column>
-            <el-table-column align="right" label="出库数量" prop="hasSendQty" min-width="110" sortable show-overflow-tooltip></el-table-column>
             <el-table-column align="right" label="单价" prop="price" min-width="100" sortable show-overflow-tooltip>
               <template slot-scope="scope">
                 {{scope.row.price | numToFixed}}
@@ -228,6 +216,13 @@
                 {{scope.row.payAmount | numToFixed}}
               </template>
             </el-table-column>
+            <el-table-column align="left" label="是否直调" prop="isDirectTransfer" min-width="100" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{scope.row.isDirectTransfer ? '是':'否'}}
+              </template>
+            </el-table-column>
+            <el-table-column align="right" label="直调数量" prop="directTransferQty" min-width="110" sortable show-overflow-tooltip></el-table-column>
+            <el-table-column align="right" label="出库数量" prop="hasSendQty" min-width="110" sortable show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="返利钱包" prop="customerWalletName2" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="right" label="使用返利金额" prop="rebateAmount" min-width="120" show-overflow-tooltip>
               <template slot-scope="scope">
@@ -243,11 +238,15 @@
             <el-table-column align="left" label="备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="表头业务员" prop="serviceName" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="表体业务员" prop="itemServiceName" min-width="100" show-overflow-tooltip></el-table-column>
-
-            <el-table-column align="left" label="制表人" prop="createBy" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="制表日期" prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="制单人" prop="createBy" min-width="100" 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="left" label="订单类型" prop="enginOrderType" min-width="100" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{scope.row.enginOrderType | typeFilter}}
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="使用单位" prop="refUseUnit" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="操作" width="220" fixed="right">
               <template slot-scope="scope">
                 <el-popconfirm

src/views/supply/pickup/sum_list.vue

@@ -56,7 +56,7 @@
       </div>
       <div class="table">
         <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe>
-          <el-table-column align="left" label="状态" min-width="100" show-overflow-tooltip>
+          <el-table-column align="left" label="状态" min-width="80" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.printNum ? '已打单':'未打单' }}
             </template>
@@ -74,31 +74,47 @@
               <span>{{scope.row.invoiceId}}</span>
             </template>
           </el-table-column>
-          <el-table-column align="left" label="预约日期" prop="pickTime" min-width="120" show-overflow-tooltip>
+          <el-table-column align="left" label="销售订单号" prop="mainOrderId" min-width="140" show-overflow-tooltip>
             <template slot-scope="scope">
-              {{ scope.row.pickTime | dateToDayFilter }}
+              <CopyButton :copyText="scope.row.mainOrderId" />
+              <span>{{scope.row.mainOrderId}}</span>
             </template>
           </el-table-column>
-          <el-table-column align="left" label="提货时段" min-width="100" show-overflow-tooltip>
+          <el-table-column align="left" label="物料编码" prop="materialCode" min-width="120" show-overflow-tooltip>
             <template slot-scope="scope">
-              {{ scope.row.pickStatus == '1' ? '上午':'下午' }}
+              <CopyButton :copyText="scope.row.materialCode" />
+              <span>{{scope.row.materialCode}}</span>
             </template>
           </el-table-column>
-          <el-table-column align="left" label="提货仓库" prop="correspondName" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="提货方式" prop="pickType" min-width="100" show-overflow-tooltip>
+          <el-table-column align="left" label="产品编码" prop="materialOldNumber" min-width="140" show-overflow-tooltip>
             <template slot-scope="scope">
-              {{ scope.row.pickType == '1' ? '自提':'物流快递' }}
+              <CopyButton :copyText="scope.row.materialOldNumber" />
+              <span>{{scope.row.materialOldNumber}}</span>
             </template>
           </el-table-column>
-          <el-table-column align="left" label="单据日期" prop="theTime" min-width="120" show-overflow-tooltip>
+          <el-table-column align="left" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip>
             <template slot-scope="scope">
-              {{ scope.row.theTime | dateToDayFilter }}
+              <CopyButton :copyText="scope.row.materialName" />
+              <span>{{scope.row.materialName}}</span>
             </template>
           </el-table-column>
-          <el-table-column align="left" label="销售订单号" prop="mainOrderId" min-width="180" show-overflow-tooltip>
+          <el-table-column align="left" label="规格型号" prop="specification" min-width="350" show-overflow-tooltip>
             <template slot-scope="scope">
-              <CopyButton :copyText="scope.row.mainOrderId" />
-              <span>{{scope.row.mainOrderId}}</span>
+              <CopyButton :copyText="scope.row.specification" />
+              <span>{{scope.row.specification}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column align="left" label="提货总数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="100" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <CopyButton :copyText="scope.row.customerNumber" />
+              <span>{{scope.row.customerNumber}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column align="left" label="经销商名称" prop="customerName" min-width="250" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <CopyButton :copyText="scope.row.customerName" />
+              <span>{{scope.row.customerName}}</span>
             </template>
           </el-table-column>
           <el-table-column align="left" label="工程编号" prop="enginOrderNo" min-width="150" show-overflow-tooltip>
@@ -107,31 +123,27 @@
               <span>{{scope.row.enginOrderNo}}</span>
             </template>
           </el-table-column>
-          <el-table-column align="left" label="物料编码" prop="materialCode" min-width="120" show-overflow-tooltip>
+          <el-table-column align="left" label="预约日期" prop="pickTime" min-width="120" show-overflow-tooltip>
             <template slot-scope="scope">
-              <CopyButton :copyText="scope.row.materialCode" />
-              <span>{{scope.row.materialCode}}</span>
+              {{ scope.row.pickTime | dateToDayFilter }}
             </template>
           </el-table-column>
-          <el-table-column align="left" label="产品编码" prop="materialOldNumber" min-width="140" show-overflow-tooltip>
+          <el-table-column align="left" label="提货时段" min-width="100" show-overflow-tooltip>
             <template slot-scope="scope">
-              <CopyButton :copyText="scope.row.materialOldNumber" />
-              <span>{{scope.row.materialOldNumber}}</span>
+              {{ scope.row.pickStatus == '1' ? '上午':'下午' }}
             </template>
           </el-table-column>
-          <el-table-column align="left" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip>
+          <el-table-column align="left" label="提货仓库" prop="correspondName" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="提货方式" prop="pickType" min-width="100" show-overflow-tooltip>
             <template slot-scope="scope">
-              <CopyButton :copyText="scope.row.materialName" />
-              <span>{{scope.row.materialName}}</span>
+              {{ scope.row.pickType == '1' ? '自提':'物流快递' }}
             </template>
           </el-table-column>
-          <el-table-column align="left" label="规格型号" prop="specification" min-width="350" show-overflow-tooltip>
+          <el-table-column align="left" label="单据日期" prop="theTime" min-width="120" show-overflow-tooltip>
             <template slot-scope="scope">
-              <CopyButton :copyText="scope.row.specification" />
-              <span>{{scope.row.specification}}</span>
+              {{ scope.row.theTime | dateToDayFilter }}
             </template>
           </el-table-column>
-          <el-table-column align="left" label="提货总数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="left" label="备注" prop="remark" min-width="100" show-overflow-tooltip></el-table-column>
         </el-table>
       </div>