fix: 家用订单

src/views/basic_data/dealer/components/subMerchantForm.vue

@@ -8,38 +8,42 @@
         <div slot="header" class="clearfix">
           <strong>客户信息</strong>
         </div>
-        <el-row :gutter="20">
-          <el-col :span="8">
-            <el-form-item label="上级商户编码" prop="higherPrantNumber">
-              <el-input v-model="formData.higherPrantNumber" placeholder="请输入上级商户编码" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="上级商户信息" prop="higherPrantName">
-              <el-input v-model="formData.higherPrantName" placeholder="请输入上级商户信息" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="商户编码">
-              <el-input v-model="formData.number" disabled placeholder="创建自动生成（仅显示不能编辑）" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="商户名称" prop="name">
-              <el-input v-model="formData.name" placeholder="请输入客户信息" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="负责人" prop="chargeName">
-              <el-input v-model="formData.chargeName" placeholder="请输入负责人姓名" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="联系电话" prop="mobile">
-              <el-input v-model="formData.mobile" placeholder="请输入联系电话" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
+        <el-row>
+          <el-row :gutter="20">
+            <el-col :span="6">
+              <el-form-item label="上级商户编码" prop="higherPrantNumber">
+                <el-input v-model="formData.higherPrantNumber" placeholder="请输入上级商户编码" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="上级商户信息" prop="higherPrantName">
+                <el-input v-model="formData.higherPrantName" placeholder="请输入上级商户信息" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="6">
+              <el-form-item label="商户编码">
+                <el-input v-model="formData.number" disabled placeholder="创建自动生成（仅显示不能编辑）" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="商户名称" prop="name">
+                <el-input v-model="formData.name" placeholder="请输入客户信息" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="负责人" prop="chargeName">
+                <el-input v-model="formData.chargeName" placeholder="请输入负责人姓名" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="联系电话" prop="mobile">
+                <el-input v-model="formData.mobile" placeholder="请输入联系电话" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-col :span="12">
             <el-form-item label="地址" prop="invoiceAddress">
               <el-input v-model="formData.invoiceAddress" placeholder="请输入地址" />
             </el-form-item>
@@ -51,7 +55,7 @@
           <strong>售后系统关联信息</strong>
         </div>
         <el-row :gutter="20" class="center">
-          <el-col :span="4">售后系统销售编号</el-col>
+          <el-col :span="3">售后系统销售编号</el-col>
           <el-col :span="4">
             <el-form-item label-width="0" prop="afterNumber" style="margin: 0">
               <el-input
@@ -62,7 +66,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="4">售后系统绑定状态</el-col>
+          <el-col :span="3">售后系统绑定状态</el-col>
           <el-col :span="4">{{ formData.binding === 'YES' ? '是' : '否' }}</el-col>
           <el-col v-if="moduleType !== 3 && moduleType !== 1" :span="4">
             <el-button type="primary" size="mini" @click="handleBinding">绑定</el-button>
@@ -78,9 +82,9 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-          <el-col :span="2">绑定时间</el-col>
+          <el-col :span="3">绑定时间</el-col>
           <el-col :span="4">{{ formData.bindingTime }}</el-col>
-          <el-col :span="2">绑定人</el-col>
+          <el-col :span="3">绑定人</el-col>
           <el-col :span="4">{{ formData.bindingName }}</el-col>
         </el-row>
       </el-card>
@@ -105,11 +109,17 @@
         </div>
         <el-row :gutter="20">
           <el-col :span="8">
-            <el-form-item label="审核人"> <el-input v-model="formData.approvalName" placeholder="系统自动生成" disabled /> </el-form-item></el-col>
+            <el-form-item label="审核人">
+              <el-input v-model="formData.approvalName" placeholder="系统自动生成" disabled /> </el-form-item
+          ></el-col>
           <el-col :span="8">
-            <el-form-item label="审核时间"> <el-input v-model="formData.approvalTime" placeholder="系统自动生成" disabled /> </el-form-item></el-col>
+            <el-form-item label="审核时间">
+              <el-input v-model="formData.approvalTime" placeholder="系统自动生成" disabled /> </el-form-item
+          ></el-col>
           <el-col :span="24">
-            <el-form-item label="备注"> <el-input v-model="formData.approvalRemark" placeholder="请输入备注" /> </el-form-item></el-col>
+            <el-form-item label="备注">
+              <el-input v-model="formData.approvalRemark" placeholder="请输入备注" /> </el-form-item
+          ></el-col>
         </el-row>
 
         <div style="margin: 20px">

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

@@ -65,10 +65,6 @@
               <div class="value">{{ detailData.refBuyUnitName }}</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>
@@ -120,7 +116,7 @@
             </el-col>
             <el-col :span="8" class="item">
               <div class="label">项目编号</div>
-              <div class="value">{{ detailData.refProjectNo }}</div>
+              <div class="value">{{ detailData.projectNo }}</div>
             </el-col>
             <!-- <el-col :span="24" class="item">
               <div class="label">格力回复</div>

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

@@ -181,7 +181,7 @@
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">项目编号</div>
-          <div class="value">{{ detailData.refProjectNo }}</div>
+          <div class="value">{{ detailData.projectNo }}</div>
         </el-col>
         <el-col :span="16" class="item">
           <div class="label">项目说明</div>

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

@@ -172,8 +172,8 @@
         </el-col>
 
         <el-col :xs="24" :sm="24" :lg="24">
-          <el-form-item label="项目编号" prop="refProjectNo">
-            <el-input v-model="mainForm.refProjectNo" placeholder="请输入项目编号" :disabled="isDealer" />
+          <el-form-item label="项目编号" prop="projectNo">
+            <el-input v-model="mainForm.projectNo" placeholder="请输入项目编号" :disabled="isDealer" />
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="24" :lg="24">
@@ -182,6 +182,21 @@
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="24" :lg="24">
+          <el-form-item label="工程机转零售批复意见" prop="refToRetailIdea">
+            <el-input v-model="mainForm.refToRetailIdea" placeholder="请输入其他附件审批意见" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :xs="24" :sm="24" :lg="24">
+          <el-form-item label="合同变更批复意见" prop="refContractIdea">
+            <el-input v-model="mainForm.refContractIdea" placeholder="请输入其他附件审批意见" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :xs="24" :sm="24" :lg="24">
+          <el-form-item label="资料延期批复意见" prop="refDataDelayIdea">
+            <el-input v-model="mainForm.refDataDelayIdea" placeholder="请输入其他附件审批意见" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :xs="24" :sm="24" :lg="24">
           <el-form-item label="其他附件审批意见" prop="refOtherAnnexIdea">
             <el-input v-model="mainForm.refOtherAnnexIdea" placeholder="请输入其他附件审批意见" disabled />
           </el-form-item>
@@ -242,9 +257,9 @@
         <el-select
           v-model="warehouseValue"
           placeholder="请选择发货仓库"
-          @change="handleWarehouseValue"
           size="small"
           style="margin-right: 10px"
+          @change="handleWarehouseValue"
         >
           <el-option v-for="(item, index) in warehouseList" :key="index" :label="item.name" :value="item.id" />
         </el-select>
@@ -372,19 +387,19 @@
               (scope.row.price * scope.row.qty * 100 -
                 ((scope.row.price * scope.row.qty * (scope.row.rebateRate * 100)) / 100) * 100 -
                 ((scope.row.qty * (scope.row.discAmount * 100)) / 100) * 100) /
-              100
+                100
             }}
           </template>
         </el-table-column>
-        <!-- <el-table-column
-              align="center"
-              label="退订数量"
-              prop="tdQty"
-              min-width="100"
-              show-overflow-tooltip
-            />
-            <el-table-column align="center" label="销售数量" prop="salesQty" min-width="100" show-overflow-tooltip />
-            <el-table-column align="center" label="销售金额" prop="salesAmount" min-width="100" show-overflow-tooltip /> -->
+        <el-table-column
+          align="center"
+          label="退订数量"
+          prop="tdQty"
+          min-width="100"
+          show-overflow-tooltip
+        />
+        <el-table-column align="center" label="销售数量" prop="salesQty" min-width="100" show-overflow-tooltip />
+        <el-table-column align="center" label="销售金额" prop="salesAmount" min-width="100" show-overflow-tooltip />
         <el-table-column align="center" label="是否直调" prop="isDirectTransfer" min-width="100">
           <template slot-scope="scope">
             <el-checkbox v-model="scope.row.isDirectTransfer" />
@@ -487,12 +502,12 @@
       :close-on-click-modal="false"
     >
       <el-form
+        v-if="mainForm.examineStatus !== 'SAVE'"
         ref="screenForm"
         :model="screenForm"
         label-width="0"
         size="small"
         label-position="left"
-        v-if="mainForm.examineStatus !== 'SAVE'"
       >
         <el-row :gutter="20">
           <el-col :xs="24" :sm="12" :lg="6">
@@ -530,8 +545,11 @@
         >
           <el-table-column align="center" label="" width="100">
             <template slot-scope="scope">
-              <el-button type="primary" size="small" @click="chooseItem(scope.row.recordNo, scope.row.userid)"
-                >选择
+              <el-button
+                type="primary"
+                size="small"
+                @click="chooseItem(scope.row.recordNo, scope.row.userid)"
+              >选择
               </el-button>
             </template>
           </el-table-column>
@@ -822,7 +840,10 @@ export default {
         refBuyUnitName: '',
         refPromiseProvide: '',
         refOtherAnnexIdea: '',
-        refProjectNo: '',
+        refToRetailIdea: '',
+        refContractIdea: '',
+        refDataDelayIdea: '',
+        projectNo: '',
         isPlanOrder: this.listItem ? '' : true
       },
       mainFormRules: {
@@ -957,7 +978,7 @@ export default {
       immediate: true,
       deep: true
     },
-    'mainForm.saleType': function (newValue, oldValue) {
+    'mainForm.saleType': function(newValue, oldValue) {
       this.oldSaleType = oldValue
     }
   },
@@ -1244,7 +1265,10 @@ export default {
         this.mainForm.examineStatus = data.examineStatus
         this.mainForm.refBuyUnitName = data.refBuyUnitName
         this.mainForm.refPromiseProvide = data.refPromiseProvide
-        this.mainForm.refProjectNo = data.refProjectNo
+        this.mainForm.projectNo = data.projectNo
+        this.mainForm.refToRetailIdea = data.refToRetailIdea
+        this.mainForm.refContractIdea = data.refContractIdea
+        this.mainForm.refDataDelayIdea = data.refDataDelayIdea
         this.correspondName = data.correspondName
         this.warehouseValue = data.correspondId
         this.mainForm.isPlanOrder = data.isPlanOrder
@@ -1581,7 +1605,12 @@ export default {
             refBuyUnitName: this.mainForm.refBuyUnitName,
             refPromiseProvide: this.mainForm.refPromiseProvide,
             refOtherAnnexIdea: this.mainForm.refOtherAnnexIdea,
-            refProjectNo: this.mainForm.refProjectNo,
+            projectNo: this.mainForm.projectNo,
+            contactMan: this.mainForm.contactMan,
+            tel: this.mainForm.tel,
+            refToRetailIdea: this.mainForm.refToRetailIdea,
+            refContractIdea: this.mainForm.refContractIdea,
+            refDataDelayIdea: this.mainForm.refDataDelayIdea,
             items: goodsList
           }
           if (this.mainForm.examineStatus === 'WAIT') {
@@ -1646,7 +1675,10 @@ export default {
       this.mainForm.refBuyUnitName = data.buyUnitName
       this.mainForm.refPromiseProvide = data.promiseProvide === 1 ? '已保证' : '未保证'
       this.mainForm.refOtherAnnexIdea = data.otherAnnexIdea
-      this.mainForm.refProjectNo = data.refProjectNo
+      this.mainForm.projectNo = data.projectNo
+      this.mainForm.refToRetailIdea = data.toRetailIdea
+      this.mainForm.refContractIdea = data.contractIdea
+      this.mainForm.refDataDelayIdea = data.dataDelayIdea
       const saleTypeItem = this.salesTypeList.find(o => o.id === this.mainForm.saleType)
 
       this.goodsList = data.items.map(item => {
@@ -1674,9 +1706,9 @@ export default {
           isDirectTransfer: false,
           directTransferQty: '',
           hasSendQty: '',
-          tdQty:0,
-          salesQty:0,
-          salesAmount:0,
+          tdQty: 0,
+          salesQty: 0,
+          salesAmount: 0,
           remark: item.discri,
           tax: '',
           status1: '',

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

@@ -114,7 +114,7 @@
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">项目编号</div>
-          <div class="value">{{ detailData.refProjectNo }}</div>
+          <div class="value">{{ detailData.projectNo }}</div>
         </el-col>
         <el-col :span="16" class="item">
           <div class="label">项目说明</div>

src/views/supply/engin/home_list.vue

@@ -17,7 +17,10 @@
           金额：<span class="num">{{ (Number(numSum.amountC) || 0) | numToFixed }}</span>
         </li>
         <li class="title">
-          数量：<span class="num">{{ Number(numSum.totalC) || 0 | numToFixed }}</span>
+          数量：<span class="num">{{ Number(numSum.totalC) || 0 }}</span>
+        </li>
+        <li class="title">
+          项目数：<span class="num">{{ Number(numSum.totalEC) || 0 }}</span>
         </li>
       </ul>
 
@@ -247,7 +250,8 @@ export default {
       typeList: [],
       numSum: {
         totalC: 0,
-        amountC: 0
+        amountC: 0,
+        totalEC: 0
       }
     }
   },
@@ -314,6 +318,7 @@ export default {
         const res = await v2EnginOrderHomeCountList(...p)
         this.numSum.totalC = res.data.totalC
         this.numSum.amountC = res.data.amountC
+        this.numSum.totalEC = res.data.totalEC
       } catch (error) {
         // console.log(error)
       }