Merge tag 'Hotfix-zh-116' into develop

Finish Hotfix-zh-116

# Conflicts:
#	src/views/supply/engin/components/home_form.vue

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

@@ -44,7 +44,7 @@
         <el-col :xs="24" :sm="12" :lg="8">
           <el-form-item label="工程登录编号" prop="loginNum">
             <div style="display: flex;">
-              <el-input v-model="mainForm.loginNum" placeholder="请输入工程登录编号"></el-input>
+              <el-input v-model="mainForm.loginNum" :disabled="isDealer" placeholder="请输入工程登录编号"></el-input>
               <el-button style="margin-left: 10px;" @click="openDialog">引用</el-button>
             </div>
           </el-form-item>

src/views/supply/deliver/sum_list.vue

@@ -171,7 +171,7 @@
                 <span>{{scope.row.specification}}</span>
               </template>
             </el-table-column>
-               <el-table-column align="left" label="仓库" prop="stockName" min-width="100" show-overflow-tooltip></el-table-column>
+               <el-table-column align="left" label="仓库" prop="correspondName" min-width="100" show-overflow-tooltip></el-table-column>
 
             <el-table-column align="right" label="发货金额" prop="payAmount" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">

src/views/supply/direct/direct_list.vue

@@ -56,7 +56,7 @@
                 <el-input v-model="screenForm.model" placeholder="请输入规格型号"></el-input>
               </el-form-item>
             </el-col>
-            
+
             <el-col :xs="24" :sm="12" :lg="6" class="tr">
               <el-form-item label="">
                 <el-button @click="resetScreenForm">清空</el-button>
@@ -87,8 +87,8 @@
             </el-table-column>
             <el-table-column align="left" label="订单号" prop="mainOrderId" min-width="140" show-overflow-tooltip>
               <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.orderType === 'TRADE' ? scope.row.enginOrderNo : scope.row.mainOrderId" />
-                <span>{{scope.row.orderType === 'TRADE' ? scope.row.enginOrderNo : scope.row.mainOrderId}}</span>
+                <CopyButton :copyText="scope.row.orderType === 'TRADE' ||scope.row.orderType === 'HOME'  ? scope.row.enginOrderNo : scope.row.mainOrderId" />
+                <span>{{scope.row.orderType === 'TRADE'||scope.row.orderType === 'HOME' ? scope.row.enginOrderNo : scope.row.mainOrderId}}</span>
               </template>
             </el-table-column>
             <el-table-column align="left" label="审核状态" prop="examineStatus" min-width="100" show-overflow-tooltip>
@@ -172,7 +172,7 @@
         </div>
       </div>
     </div>
-    
+
     <DirectDetail :listItem="queryItem" v-if="isShowDetail" @backListFormDetail="backList" />
     <DirectExamine :listItem="queryItem" v-if="isShowExamine" @backListFormDetail="backList" />
     <DirectForm :listItem="queryItem" v-if="isShowForm" @backListFormDetail="backList" />

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

@@ -644,7 +644,8 @@ export default {
         enginInfoNo: this.screenForm.enginNum,
         projectName: this.screenForm.projectName,
         useUnit: this.screenForm.useUnit,
-        examineStatus: 'OK'
+        examineStatus: 'OK',
+            customerId:this.listItem ?this.listItem.customerId :'' ,
       }).then(res => {
         this.dialogTable_dataList = res.data.records;
         this.dialogTable_listTotal = res.data.total;

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

@@ -601,6 +601,7 @@ export default {
         specification: this.goodsScreenForm.proModel,
         price1: this.goodsScreenForm.price1,
         price2: this.goodsScreenForm.price2,
+            customerId:this.listItem ?this.listItem.customerId :'' ,
       }).then(res => {
         let oldGoodsList = this.goodsList;
         let newGoodsList = res.data.records;

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

@@ -317,8 +317,8 @@
         <el-table :data="directGoodsList" 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="materialNumber" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="物料代码" prop="materialOldNumber" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="物料代码" prop="materialNumber" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="产品编码" prop="materialOldNumber" min-width="160" 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>

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

@@ -937,7 +937,7 @@ export default {
         specification: this.goodsScreenForm.proModel,
         price1: this.goodsScreenForm.price1,
         price2: this.goodsScreenForm.price2,
-        customerId: this.mainForm.customerId ? this.mainForm.customerId : ''
+            customerId:this.listItem ?this.listItem.customerId :'' ,
       }).then(res => {
         let oldGoodsList = this.goodsList;
         let newGoodsList = res.data.records;

src/views/supply/engin/engin_list.vue

@@ -172,7 +172,13 @@
               </template>
             </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="price" min-width="100" show-overflow-tooltip>
+ <template slot-scope="scope">
+                {{scope.row.price | numToFixed}}
+              </template>
+                      </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="right" label="金额" prop="totalAmount" min-width="100" sortable show-overflow-tooltip>
               <template slot-scope="scope">
                 {{scope.row.totalAmount | numToFixed}}

src/views/supply/policy/components/retail_form.vue

@@ -68,7 +68,6 @@
             <el-select
               v-model="mainForm.k3ServiceName"
               placeholder="选择业务员"
-
               style="width: 100%"
               @change="handleUser"
             >
@@ -1138,6 +1137,7 @@ export default {
         popType,
         specification:this.screenForm.specification,
          saleTypeCode: this.screenForm.saleTypeCode,
+             customerId:this.listItem ?this.listItem.customerId :'' ,
       })
 
       if (!fang) {
@@ -1208,6 +1208,7 @@ export default {
         policyId: this.screenForm.policyId,
         saleTypeCode: this.screenForm.saleTypeCode,
         specification:this.screenForm.specification,
+            customerId:this.listItem ?this.listItem.customerId :'' ,
         [val]: true
       }).then((res) => {
         this.dataList = res.data.records
@@ -1500,6 +1501,7 @@ export default {
       policyList({
         pageNum: 1,
         pageSize: -1,
+        customerId:this.listItem ?this.listItem.customerId :'' ,
         status: true
       }).then((res) => {
         if (this.policyId) {

src/views/supply/retail/components/retail_form.vue

@@ -527,6 +527,7 @@ export default {
         specification: this.screenForm.proModel,
         price1: this.screenForm.price1,
         price2: this.screenForm.price2,
+            customerId:this.listItem ?this.listItem.customerId :'' ,
       }).then(res => {
         let oldGoodsList = this.goodsList;
         let newGoodsList = res.data.records;