【修改】。。。

src/views/supply/apply/apply_list.vue

@@ -352,7 +352,7 @@ export default {
         { label: '已保存', value: 'SAVE' },
         { label: '待审核', value: 'WAIT' },
         { label: '审核通过', value: 'OK' },
-        { label: '审核驳回', value: 'FAIL' },
+        // { label: '审核驳回', value: 'FAIL' },
         { label: '已关闭', value: 'CLOSE' },
       ],
       orderTypeList: [

src/views/supply/apply/engin_list.vue

@@ -370,7 +370,7 @@ export default {
         { label: '已保存', value: 'SAVE' },
         { label: '待审核', value: 'WAIT' },
         { label: '审核通过', value: 'OK' },
-        { label: '审核驳回', value: 'FAIL' },
+        // { label: '审核驳回', value: 'FAIL' },
         { label: '已关闭', value: 'CLOSE' },
       ],
       orderTypeList: [

src/views/supply/direct/direct_list.vue

@@ -220,7 +220,7 @@ export default {
         { label: '已保存', value: 'SAVE' },
         { label: '待审核', value: 'WAIT' },
         { label: '审核通过', value: 'OK' },
-        { label: '审核驳回', value: 'FAIL' },
+        // { label: '审核驳回', value: 'FAIL' },
         { label: '已关闭', value: 'CLOSE' },
       ],
 

src/views/supply/engin/commerce_list.vue

@@ -47,7 +47,9 @@
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="销售类型" prop="saleType">
-                <el-input v-model="screenForm.saleType" placeholder="请输入销售类型"></el-input>
+                <el-select v-model="screenForm.saleType" placeholder="选择销售类型" style="width: 100%" clearable>
+                  <el-option v-for="item in salesTypeList" :key="item.id" :label="item.saleName" :value="item.id"></el-option>
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
@@ -206,7 +208,7 @@
               </template>
             </el-table-column>
             <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="serviceName" 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>
@@ -297,7 +299,7 @@
 
 <script>
 import { getOrderList, applyCom, withdrawCom, deleteCom, editDateCom, abandonCom } from "@/api/supply/engin";
-import { getSalesmanList } from '@/api/common'
+import { getSalesmanList, getTypeList } from '@/api/common'
 import CommerceDetail from "@/views/supply/engin/components/commerce_detail";
 import CommerceForm from "@/views/supply/engin/components/commerce_form";
 import CommerceExamine from "@/views/supply/engin/components/commerce_examine";
@@ -351,7 +353,7 @@ export default {
         { label: '已保存', value: 'SAVE' },
         { label: '待审核', value: 'WAIT' },
         { label: '审核通过', value: 'OK' },
-        { label: '审核驳回', value: 'FAIL' },
+        // { label: '审核驳回', value: 'FAIL' },
         { label: '已关闭', value: 'CLOSE' },
       ],
       salesmanList: [],
@@ -401,6 +403,7 @@ export default {
   },
 
   created() {
+    this.getSalesTypeList();
     this.getSalesmanList();
     this.getList();
   },
@@ -418,6 +421,16 @@ export default {
       })
     },
 
+    // 获取销售类型列表
+    getSalesTypeList() {
+      getTypeList({
+        pageNum: 1,
+        pageSize: -1
+      }).then((res) => {
+        this.salesTypeList = res.data.records;
+      })
+    },
+
     // 查询列表
     getList() {
       this.listLoading = true;

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

@@ -115,6 +115,10 @@
           <div class="label">关闭日期</div>
           <div class="value">{{detailData.closeTime}}</div>
         </el-col>
+        <el-col :span="24" class="item">
+          <div class="label">审批说明</div>
+          <div class="value">{{detailData.examineNote}}</div>
+        </el-col>
       </el-row>
     </div>
 
@@ -285,6 +289,7 @@ export default {
           })
         }
         this.detailData = res.data;
+        this.examineForm.remark = res.data.examineNote;
       })
     },
 

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

@@ -63,7 +63,12 @@
         <el-col :span="8" class="item">
           <div class="label">行业类别</div>
           <div class="value">
-            <el-input v-model="detailData.tradeCategory" placeholder="请输入行业类别"></el-input>
+            <el-select v-model="detailData.tradeCategory" placeholder="选择行业类别" size="small" clearable style="width: 100%">
+              <el-option
+                v-for="item in tradeCategoryList"
+                :key="item.value" :label="item.label" :value="item.value">
+              </el-option>
+            </el-select>
           </div>
         </el-col>
         <el-col :span="8" class="item">
@@ -370,6 +375,19 @@ export default {
       machineTypeList: [],
       loginTypeList: [],
       powerList: [],
+      tradeCategoryList: [
+        {value: '房地产', label: '房地产'},
+        {value: '公共建筑', label: '公共建筑'},
+        {value: '工业制造', label: '工业制造'},
+        {value: '商业项目', label: '商业项目'},
+        {value: '采暖及清洁能源', label: '采暖及清洁能源'},
+        {value: '轨道交通', label: '轨道交通'},
+        {value: '数据通讯', label: '数据通讯'},
+        {value: '冷冻冷藏', label: '冷冻冷藏'},
+        {value: '高端制造', label: '高端制造'},
+        {value: '医院医疗', label: '医院医疗'},
+        {value: '其他', label: '其他'},
+      ],
       
       isShowGoodsDialog: false,
       goodsScreenForm: {

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

@@ -85,7 +85,12 @@
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">
           <el-form-item label="行业类别" prop="tradeCategory">
-            <el-input v-model="mainForm.tradeCategory" placeholder="请输入行业类别"></el-input>
+            <el-select v-model="mainForm.tradeCategory" placeholder="选择行业类别" size="small" clearable style="width: 100%">
+              <el-option
+                v-for="item in tradeCategoryList"
+                :key="item.value" :label="item.label" :value="item.value">
+              </el-option>
+            </el-select>
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">
@@ -392,6 +397,19 @@ export default {
       loginTypeList: [],
       powerList: [],
       machineTypeList: [],
+      tradeCategoryList: [
+        {value: '房地产', label: '房地产'},
+        {value: '公共建筑', label: '公共建筑'},
+        {value: '工业制造', label: '工业制造'},
+        {value: '商业项目', label: '商业项目'},
+        {value: '采暖及清洁能源', label: '采暖及清洁能源'},
+        {value: '轨道交通', label: '轨道交通'},
+        {value: '数据通讯', label: '数据通讯'},
+        {value: '冷冻冷藏', label: '冷冻冷藏'},
+        {value: '高端制造', label: '高端制造'},
+        {value: '医院医疗', label: '医院医疗'},
+        {value: '其他', label: '其他'},
+      ],
 
       typeList: [],
       salesTypeList: [],

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

@@ -413,6 +413,7 @@ export default {
           });
         })
         this.detailData = res.data;
+        this.examineForm.remark = res.data.examineNote;
       })
     },
 

src/views/supply/engin/engin_list.vue

@@ -306,7 +306,7 @@ export default {
         { label: '已保存', value: 'SAVE' },
         { label: '待审核', value: 'WAIT' },
         { label: '审核通过', value: 'OK' },
-        { label: '审核驳回', value: 'FAIL' },
+        // { label: '审核驳回', value: 'FAIL' },
         { label: '已关闭', value: 'CLOSE' },
       ],
       salesmanList: [],

src/views/supply/engin/home_list.vue

@@ -47,7 +47,9 @@
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="销售类型" prop="saleType">
-                <el-input v-model="screenForm.saleType" placeholder="请输入销售类型"></el-input>
+                <el-select v-model="screenForm.saleType" placeholder="选择销售类型" style="width: 100%" clearable>
+                  <el-option v-for="item in salesTypeList" :key="item.id" :label="item.saleName" :value="item.id"></el-option>
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
@@ -220,7 +222,8 @@
               </template>
             </el-table-column>
             <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="serviceName" 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="confirmBy" min-width="100" show-overflow-tooltip></el-table-column>
@@ -310,7 +313,7 @@
 
 <script>
 import { getOrderList, applyHome, withdrawHome, deleteHome, editDateHome, abandonHome } from "@/api/supply/engin";
-import { getSalesmanList } from '@/api/common'
+import { getSalesmanList, getTypeList } from '@/api/common'
 import HomeDetail from "@/views/supply/engin/components/home_detail";
 import HomeForm from "@/views/supply/engin/components/home_form";
 import HomeExamine from "@/views/supply/engin/components/home_examine";
@@ -367,7 +370,7 @@ export default {
         { label: '已保存', value: 'SAVE' },
         { label: '待审核', value: 'WAIT' },
         { label: '审核通过', value: 'OK' },
-        { label: '审核驳回', value: 'FAIL' },
+        // { label: '审核驳回', value: 'FAIL' },
         { label: '已关闭', value: 'CLOSE' },
       ],
       salesmanList: [],
@@ -420,6 +423,7 @@ export default {
   },
 
   created() {
+    this.getSalesTypeList();
     this.getSalesmanList();
     this.getList();
   },
@@ -437,6 +441,16 @@ export default {
       })
     },
 
+    // 获取销售类型列表
+    getSalesTypeList() {
+      getTypeList({
+        pageNum: 1,
+        pageSize: -1
+      }).then((res) => {
+        this.salesTypeList = res.data.records;
+      })
+    },
+
     // 查询列表
     getList() {
       this.listLoading = true;

src/views/supply/sales/sales_list.vue

@@ -181,6 +181,7 @@
             <el-table-column align="left" label="发货申请备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="表体备注" prop="invoiceRemark" 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="k3ServiceName" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="操作" width="120" fixed="right">
               <template slot-scope="scope">
                 <el-button type="text" @click="toDetail(scope.row)">详情</el-button>