【修改】

1.家用工程订单
2.零售订单

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

@@ -560,7 +560,7 @@ export default {
           let positionItem2 = this.positionList2.find(o => o.id == this.directForm.position2);
           let params = {
             orderNo: this.detailData.enginOrderId,
-            orderType: 3, // 1零售单 2政策单 3家用工程 4商用工程
+            orderType: 'HOME', // TRADE=商用 HOME=家用 RETAIL=零售单 RETAIL_POLICY 销售政策单
             correspondId: this.directForm.warehouse1,
             correspondName: warehouseItem1.name,
             stockId: this.directForm.position1,

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

@@ -271,7 +271,7 @@ export default {
         examineHome(params).then(res => {
           this.$successMsg();
           this.goBack();
-          this.$parent.toDetail(this.detailData);
+          this.$parent.getList();
         })
       }).catch(() => {});
     },

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

@@ -271,7 +271,7 @@ export default {
         returnHome(params).then(res => {
           this.$successMsg();
           this.goBack();
-          this.$parent.toDetail(this.detailData);
+          this.$parent.getList();
         })
       }).catch(() => {});
     },

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

@@ -6,13 +6,13 @@
       <div class="title">订单信息</div>
     </div>
 
-    <el-form ref="mainForm" :model="mainForm" :rules="mainFormRules" label-width="80px" size="small" label-position="right">
+    <el-form ref="mainForm" :model="mainForm" :rules="mainFormRules" label-width="100px" size="small" label-position="right">
       <el-row :gutter="20">
-        <!-- <el-col :xs="24" :sm="12" :lg="8" v-if="listItem">
-          <el-form-item label="订单号" prop="id">
-            <el-input v-model="listItem.id" readonly></el-input>
+        <el-col :xs="24" :sm="12" :lg="8">
+          <el-form-item label="订单号" prop="orderNum">
+            <el-input v-model="mainForm.orderNum" placeholder="系统自动生成" readonly></el-input>
           </el-form-item>
-        </el-col> -->
+        </el-col>
         <el-col :xs="24" :sm="12" :lg="8" style="height: 51px;">
           <el-form-item label="单据日期" prop="date">
             <el-date-picker
@@ -31,16 +31,19 @@
             </el-select>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :xs="24" :sm="12" :lg="8" v-if="listItem">
-          <el-form-item label="业务员" prop="serviceName">
-            <el-input v-model="listItem.serviceName" readonly></el-input>
+        <el-col :xs="24" :sm="12" :lg="8">
+          <el-form-item label="经销商编码" prop="jxsNum">
+            <el-input v-model="mainForm.jxsNum" placeholder="请输入经销商编码" readonly></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :xs="24" :sm="12" :lg="16">
+          <el-form-item label="经销商名称" prop="jxsName">
+            <el-input v-model="mainForm.jxsName" placeholder="请输入经销商名称" readonly></el-input>
           </el-form-item>
         </el-col>
-        <el-col :xs="24" :sm="16" :lg="16">
-          <el-form-item label="备注" prop="remark">
-            <el-input v-model="mainForm.remark" placeholder="请输入备注"></el-input>
+        <el-col :xs="24" :sm="24" :lg="24">
+          <el-form-item label="表头备注" prop="remark">
+            <el-input v-model="mainForm.remark" placeholder="请输入表头备注"></el-input>
           </el-form-item>
         </el-col>
       </el-row>
@@ -77,9 +80,9 @@
             {{scope.row.price * scope.row.qty}}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="返利钱包" prop="customerWalletId2" min-width="160" show-overflow-tooltip>
+        <el-table-column align="center" label="返利类型" prop="customerWalletId2" min-width="160" show-overflow-tooltip>
           <template slot-scope="scope">
-            <el-select v-model="scope.row.customerWalletId2" placeholder="选择返利钱包" size="small" clearable @change="changeWallet(scope.$index)">
+            <el-select v-model="scope.row.customerWalletId2" placeholder="选择返利类型" size="small" clearable @change="changeWallet(scope.$index)">
               <el-option
                 v-for="item in flWalletList"
                 :key="item.customerWalletId"
@@ -89,7 +92,7 @@
             </el-select>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="返利金额" min-width="100" show-overflow-tooltip>
+        <el-table-column align="center" label="使用返利金额" min-width="120" show-overflow-tooltip>
           <template slot-scope="scope">
             {{(scope.row.price * scope.row.qty * (scope.row.rebateRate * 100)) / 100}}
           </template>
@@ -277,8 +280,12 @@ export default {
   data() {
     return {
       mainForm: {
+        orderNum: '',
         date: '',
         type: '',
+        jxsNum: '',
+        jxsName: '',
+        serviceName: '',
         remark: '',
       },
       mainFormRules: {
@@ -337,6 +344,9 @@ export default {
     this.getWarehouseList();
     if(this.listItem) {
       this.getDetail();
+    }else {
+      this.mainForm.jxsNum = JSON.parse(localStorage.getItem("supply_user")).customerId;
+      this.mainForm.jxsName = JSON.parse(localStorage.getItem("supply_user")).customerName;
     }
   },
 
@@ -350,8 +360,11 @@ export default {
     getDetail() {
       getDetail({id: this.listItem.id}).then(res => {
         let data = res.data;
+        this.mainForm.orderNum = data.id;
         this.mainForm.date = data.theTime;
         this.mainForm.type = data.mainId;
+        this.mainForm.jxsNum = data.customerId;
+        this.mainForm.jxsName = data.customerName;
         this.mainForm.remark = data.remark;
         data.retailOrderItemList.forEach(item => {
           item.status1 = '';

src/views/supply/retail/retail_list.vue

@@ -19,13 +19,13 @@
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="销售政策编号" prop="policyCode">
-                <el-input v-model="screenForm.policyCode" placeholder="请输入销售政策编号"></el-input>
+              <el-form-item label="货品名称" prop="goodsName">
+                <el-input v-model="screenForm.goodsName" placeholder="请输入货品名称"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="销售政策说明" prop="policyRemark">
-                <el-input v-model="screenForm.policyRemark" placeholder="请输入销售政策说明"></el-input>
+              <el-form-item label="规格型号" prop="model">
+                <el-input v-model="screenForm.model" placeholder="请输入规格型号"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
@@ -78,6 +78,21 @@
         </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="center" label="提货进度" min-width="120" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <el-progress :text-inside="true" :stroke-width="26" :percentage="((scope.row.takeQty * 100) / (scope.row.totalQty * 100)) || 0"></el-progress>
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="审核状态" prop="examineStatus" min-width="100" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{scope.row.examineStatus | statusFilter}}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="开票状态" prop="isInvoicing" min-width="100" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{scope.row.isInvoicing ? '已开票':'未开票'}}
+              </template>
+            </el-table-column>
             <el-table-column align="center" label="订单号" prop="id" min-width="180" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="订单日期" prop="theTime" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
@@ -97,7 +112,7 @@
             <el-table-column align="center" label="直调数量" prop="directTransferQty" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="出库数量" prop="hasSendQty" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="单价" prop="price" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="金额" prop="totalAmount" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="金额" prop="payAmount" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="返利使用比例" prop="rebateRate" min-width="110" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="返利金额" prop="rebateAmount" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
@@ -110,11 +125,6 @@
             <el-table-column align="center" label="制表日期" prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="审核人" prop="examineName" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="审核日期" prop="examineTime" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="审核状态" prop="examineStatus" min-width="100" show-overflow-tooltip>
-              <template slot-scope="scope">
-                {{scope.row.examineStatus | statusFilter}}
-              </template>
-            </el-table-column>
             <el-table-column align="center" label="操作" width="220" fixed="right">
               <template slot-scope="scope">
                 <el-button type="text" @click="toForm(scope.row)" v-if="scope.row.examineStatus === 'SAVE'">编辑</el-button>
@@ -185,8 +195,8 @@ export default {
       listLoading: false, // 列表加载loading
       screenForm: { // 筛选表单数据
         orderNum: '',
-        policyCode: '',
-        policyRemark: '',
+        goodsName: '',
+        model: '',
         jxsName: '',
         date: '',
         zbMan: '',
@@ -213,8 +223,8 @@ export default {
       return {
         examineStatus: this.screenForm.status,
         id: this.screenForm.orderNum,
-        policyCode: this.screenForm.policyCode,
-        policyRemark: this.screenForm.policyRemark,
+        materialName: this.screenForm.goodsName,
+        specification: this.screenForm.model,
         customer: this.screenForm.jxsName,
         startTime: this.screenForm.date ? this.screenForm.date[0] : '',
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
@@ -252,8 +262,8 @@ export default {
         pageSize: this.pageSize,
         examineStatus: this.screenForm.status,
         id: this.screenForm.orderNum,
-        policyCode: this.screenForm.policyCode,
-        policyRemark: this.screenForm.policyRemark,
+        materialName: this.screenForm.goodsName,
+        specification: this.screenForm.model,
         customer: this.screenForm.jxsName,
         startTime: this.screenForm.date ? this.screenForm.date[0] : '',
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',