【修改】

1.销售单执行明细/汇总 - 增加筛选条件
2.零售发货退货申请单
3.销售出库单

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

@@ -87,12 +87,12 @@
         <el-table-column align="center" label="未申请数量" prop="canApply" min-width="100" show-overflow-tooltip> </el-table-column>
           <el-table-column align="left" label="表头备注" prop="headerRemark" min-width="160" show-overflow-tooltip>
           <template slot-scope="scope">
-            <el-input v-model="scope.row.headerRemark" size="small"></el-input>
+            <el-input v-model="scope.row.headerRemark" size="small" :disabled="isDealer"></el-input>
           </template>
         </el-table-column>
-            <el-table-column align="left" label="表体备注" prop="invoiceRemark" min-width="160" show-overflow-tooltip>
+        <el-table-column align="left" label="表体备注" prop="invoiceRemark" min-width="160" show-overflow-tooltip>
           <template slot-scope="scope">
-            <el-input v-model="scope.row.invoiceRemark" size="small"></el-input>
+            <el-input v-model="scope.row.invoiceRemark" size="small" :disabled="isDealer"></el-input>
           </template>
         </el-table-column>
         <el-table-column align="center" label="操作" width="100" fixed="right">
@@ -255,6 +255,12 @@ export default {
     }
   },
 
+  computed: {
+    isDealer() {
+      return JSON.parse(localStorage.getItem("supply_user")).isCustomer
+    },
+  },
+
   created() {
     this.getDictList();
     this.getWarehouseList();

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

@@ -102,12 +102,12 @@
         </el-table-column> -->
         <el-table-column align="left" label="表头备注" prop="headerRemark" min-width="160" show-overflow-tooltip>
           <template slot-scope="scope">
-            <el-input v-model="scope.row.headerRemark" size="small"></el-input>
+            <el-input v-model="scope.row.headerRemark" size="small" :disabled="isDealer"></el-input>
           </template>
         </el-table-column>
             <el-table-column align="left" label="表体备注" prop="invoiceRemark" min-width="160" show-overflow-tooltip>
           <template slot-scope="scope">
-            <el-input v-model="scope.row.invoiceRemark" size="small"></el-input>
+            <el-input v-model="scope.row.invoiceRemark" size="small" :disabled="isDealer"></el-input>
           </template>
         </el-table-column>
 
@@ -279,6 +279,12 @@ export default {
     }
   },
 
+  computed: {
+    isDealer() {
+      return JSON.parse(localStorage.getItem("supply_user")).isCustomer
+    },
+  },
+
   watch: {
     goodsList: {
       handler(newValue, oldValue) {

src/views/supply/implement/implement_list.vue

@@ -48,18 +48,17 @@
                 <el-input v-model="screenForm.loginNum" placeholder="请输入工程登录编号"></el-input>
               </el-form-item>
             </el-col>
-               <el-col :xs="24" :sm="12" :lg="6">
+            <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="存货类别" prop="k3CategoryNumber">
-                 <el-select v-model="screenForm.k3CategoryNumber" filterable  placeholder="请选择">
-                    <el-option
-                      v-for="item in categoryList"
-                      :key="item.id"
-                      :label="item.name"
-                      :value="item.id">
-                    </el-option>
-                  </el-select>
+                <el-select v-model="screenForm.k3CategoryNumber" filterable clearable placeholder="请选择">
+                  <el-option
+                    v-for="item in categoryList"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id">
+                  </el-option>
+                </el-select>
               </el-form-item>
-              <!-- categoryList -->
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="下单日期" prop="date">
@@ -79,18 +78,35 @@
                 <el-input v-model="screenForm.serviceName " placeholder="请输入表头业务员"></el-input>
               </el-form-item>
             </el-col>
-
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="表体业务员" prop="itemServiceName">
                 <el-input v-model="screenForm.itemServiceName" placeholder="请输入表体业务员"></el-input>
               </el-form-item>
             </el-col>
-    <el-col :xs="24" :sm="12" :lg="6">
+            <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="归属业务员" prop="newServiceName">
                 <el-input v-model="screenForm.newServiceName" placeholder="请输入归属业务员"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="24" :lg="24" class="tr">
+            <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>
+            </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>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="发货是否完成" prop="isOver">
+                <el-select v-model="screenForm.isOver" clearable placeholder="请选择">
+                  <el-option label="是" :value="true"></el-option>
+                  <el-option label="否" :value="false"></el-option>
+                </el-select>
+              </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>
                 <el-button type="primary" @click="submitScreenForm">搜索</el-button>
@@ -253,11 +269,14 @@ export default {
         model: '',
         date: '',
         serviceName : '',
-        itemServiceName:'',
+        itemServiceName: '',
         newServiceName: '',
         enginName: '',
         loginNum: '',
-        k3CategoryNumber:''
+        k3CategoryNumber: '',
+        policyCode: '',
+        policyRemark: '',
+        isOver: '',
       },
       categoryList:[],
       statusList: [
@@ -282,10 +301,13 @@ export default {
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
         serviceName: this.screenForm.serviceName ,
         newServiceName: this.screenForm.newServiceName,
-          itemServiceName:this.screenForm.itemServiceName,
+        itemServiceName:this.screenForm.itemServiceName,
         projectName: this.screenForm.enginName,
         enginRecordNo: this.screenForm.orderNum,
-        k3CategoryNumber:this.screenForm.k3CategoryNumber
+        k3CategoryNumber: this.screenForm.k3CategoryNumber,
+        policyCode: this.screenForm.policyCode,
+        policyRemark: this.screenForm.policyRemark,
+        isOver: this.screenForm.isOver,
       }
     },
   },
@@ -300,15 +322,6 @@ export default {
   },
 
   methods: {
-    // 查询按钮权限
-    checkBtnRole(value) {
-      // let btnRole = this.$route.meta.roles;
-      // if(!btnRole) {return true}
-      // let index = btnRole.indexOf(value);
-      // return index >= 0;
-      return true
-    },
-
     // 查询列表
     getList() {
       this.listLoading = true;
@@ -326,10 +339,13 @@ export default {
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
         serviceName: this.screenForm.serviceName ,
         newServiceName: this.screenForm.newServiceName,
-            itemServiceName:this.screenForm.itemServiceName,
+        itemServiceName: this.screenForm.itemServiceName,
         projectName: this.screenForm.enginName,
         enginRecordNo: this.screenForm.orderNum,
-        k3CategoryNumber:this.screenForm.k3CategoryNumber
+        k3CategoryNumber: this.screenForm.k3CategoryNumber,
+        policyCode: this.screenForm.policyCode,
+        policyRemark: this.screenForm.policyRemark,
+        isOver: this.screenForm.isOver,
       };
       getList(params).then((res) => {
         res.data.records.forEach(item => {
@@ -341,17 +357,18 @@ export default {
         this.listLoading = false;
       })
     },
+
     // 获取存货类别列表
-  getCategoryList(){
-    getCategoryList({
-      pageNum:1,
-      pageSize:-1,
-      keyword:''
-    }).then(res=>{
+    getCategoryList(){
+      getCategoryList({
+        pageNum:1,
+        pageSize:-1,
+        keyword:''
+      }).then(res=>{
+        this.categoryList = res.data.records;
+      })
+    },
 
-      this.categoryList =   res.data.records
-    })
-  },
     // 提交筛选表单
     submitScreenForm() {
       this.currentPage = 1;

src/views/supply/implement/implement_total_list.vue

@@ -37,7 +37,6 @@
                 <el-input v-model="screenForm.model" placeholder="请输入规格型号"></el-input>
               </el-form-item>
             </el-col>
-
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="项目名称" prop="enginName">
                 <el-input v-model="screenForm.enginName" placeholder="请输入项目名称"></el-input>
@@ -48,18 +47,17 @@
                 <el-input v-model="screenForm.loginNum" placeholder="请输入工程登录编号"></el-input>
               </el-form-item>
             </el-col>
-               <el-col :xs="24" :sm="12" :lg="6">
+            <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="存货类别" prop="k3CategoryNumber">
-                 <el-select v-model="screenForm.k3CategoryNumber" filterable  placeholder="请选择">
-                    <el-option
-                      v-for="item in categoryList"
-                      :key="item.id"
-                      :label="item.name"
-                      :value="item.id">
-                    </el-option>
-                  </el-select>
+                <el-select v-model="screenForm.k3CategoryNumber" filterable clearable placeholder="请选择">
+                  <el-option
+                    v-for="item in categoryList"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id">
+                  </el-option>
+                </el-select>
               </el-form-item>
-              <!-- categoryList -->
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="下单日期" prop="date">
@@ -74,23 +72,40 @@
                 </el-date-picker>
               </el-form-item>
             </el-col>
-                <el-col :xs="24" :sm="12" :lg="6">
+            <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="表头业务员" prop="serviceName ">
                 <el-input v-model="screenForm.serviceName " placeholder="请输入表头业务员"></el-input>
               </el-form-item>
             </el-col>
-
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="表体业务员" prop="itemServiceName">
                 <el-input v-model="screenForm.itemServiceName" placeholder="请输入表体业务员"></el-input>
               </el-form-item>
             </el-col>
-    <el-col :xs="24" :sm="12" :lg="6">
+            <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="归属业务员" prop="newServiceName">
                 <el-input v-model="screenForm.newServiceName" placeholder="请输入归属业务员"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="24" :lg="24" class="tr">
+            <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>
+            </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>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="发货是否完成" prop="isOver">
+                <el-select v-model="screenForm.isOver" clearable placeholder="请选择">
+                  <el-option label="是" :value="true"></el-option>
+                  <el-option label="否" :value="false"></el-option>
+                </el-select>
+              </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>
                 <el-button type="primary" @click="submitScreenForm">搜索</el-button>
@@ -197,8 +212,8 @@
               </template>
             </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="newServiceName" 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="newServiceName" min-width="100" show-overflow-tooltip></el-table-column>
             <!-- <el-table-column align="left" label="订单备注" prop="headerRemark" 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 align="left" label="表体备注" prop="itemRemark" min-width="160" show-overflow-tooltip></el-table-column>
@@ -251,13 +266,16 @@ export default {
         model: '',
         date: '',
         serviceName : '',
-        itemServiceName:'',
+        itemServiceName: '',
         newServiceName: '',
         enginName: '',
         loginNum: '',
-        k3CategoryNumber:''
+        k3CategoryNumber: '',
+        policyCode: '',
+        policyRemark: '',
+        isOver: '',
       },
-      categoryList:[],
+      categoryList: [],
       statusList: [
         { label: '政策零售订单', value: '2' },
         { label: '零售订单', value: '1' },
@@ -280,10 +298,13 @@ export default {
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
         serviceName: this.screenForm.serviceName ,
         newServiceName: this.screenForm.newServiceName,
-          itemServiceName:this.screenForm.itemServiceName,
+        itemServiceName: this.screenForm.itemServiceName,
         projectName: this.screenForm.enginName,
         enginRecordNo: this.screenForm.orderNum,
-        k3CategoryNumber:this.screenForm.k3CategoryNumber
+        k3CategoryNumber: this.screenForm.k3CategoryNumber,
+        policyCode: this.screenForm.policyCode,
+        policyRemark: this.screenForm.policyRemark,
+        isOver: this.screenForm.isOver,
       }
     },
   },
@@ -298,15 +319,6 @@ export default {
   },
 
   methods: {
-    // 查询按钮权限
-    checkBtnRole(value) {
-      // let btnRole = this.$route.meta.roles;
-      // if(!btnRole) {return true}
-      // let index = btnRole.indexOf(value);
-      // return index >= 0;
-      return true
-    },
-
     // 查询列表
     getList() {
       this.listLoading = true;
@@ -324,10 +336,13 @@ export default {
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
         serviceName: this.screenForm.serviceName ,
         newServiceName: this.screenForm.newServiceName,
-            itemServiceName:this.screenForm.itemServiceName,
+        itemServiceName: this.screenForm.itemServiceName,
         projectName: this.screenForm.enginName,
         enginRecordNo: this.screenForm.orderNum,
-        k3CategoryNumber:this.screenForm.k3CategoryNumber
+        k3CategoryNumber: this.screenForm.k3CategoryNumber,
+        policyCode: this.screenForm.policyCode,
+        policyRemark: this.screenForm.policyRemark,
+        isOver: this.screenForm.isOver,
       };
       getTotalList(params).then((res) => {
         res.data.records.forEach(item => {
@@ -339,17 +354,18 @@ export default {
         this.listLoading = false;
       })
     },
+
     // 获取存货类别列表
-  getCategoryList(){
-    getCategoryList({
-      pageNum:1,
-      pageSize:-1,
-      keyword:''
-    }).then(res=>{
+    getCategoryList(){
+      getCategoryList({
+        pageNum: 1,
+        pageSize: -1,
+        keyword: ''
+      }).then(res=>{
+        this.categoryList =   res.data.records;
+      })
+    },
 
-      this.categoryList =   res.data.records
-    })
-  },
     // 提交筛选表单
     submitScreenForm() {
       this.currentPage = 1;

src/views/supply/implement/nsales_list.vue

@@ -81,7 +81,7 @@
                 </el-date-picker>
               </el-form-item>
             </el-col>
-<el-col :xs="24" :sm="12" :lg="6">
+            <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="出库单号" prop="id">
                 <el-input
                   v-model="screenForm.id"
@@ -102,8 +102,8 @@
       <div class="mymain-container">
         <div class="btn-group clearfix">
           <div class="fl">
-<!--            <el-button size="mini" type="primary" icon="el-icon-plus" @click="toReturnForm()" v-if="$checkBtnRole('refund', $route.meta.roles)">退货申请</el-button>-->
-<!--            <el-button size="mini" type="warning" icon="el-icon-finished" @click="batchExamine" :disabled="multipleSelection.length < 1" v-if="$checkBtnRole('examine', $route.meta.roles)">批量审批</el-button>-->
+            <!-- <el-button size="mini" type="primary" icon="el-icon-plus" @click="toReturnForm()" v-if="$checkBtnRole('refund', $route.meta.roles)">退货申请</el-button>-->
+            <!-- <el-button size="mini" type="warning" icon="el-icon-finished" @click="batchExamine" :disabled="multipleSelection.length < 1" v-if="$checkBtnRole('examine', $route.meta.roles)">批量审批</el-button>-->
           </div>
           <div class="fr">
             <ExportButton :exUrl="'sale/order/export'" :exParams="exParams" />
@@ -121,22 +121,22 @@
             @selection-change="handleSelectionChange"
             show-summary
             :summary-method="$getSummaries">
-<!--            <el-table-column align="center" type="selection" width="55"></el-table-column>-->
+            <!-- <el-table-column align="center" type="selection" width="55"></el-table-column>-->
             <el-table-column align="left" 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="left" label="开票状态" prop="billStatus" min-width="100" show-overflow-tooltip>
+            <!-- <el-table-column align="left" label="开票状态" prop="billStatus" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{scope.row.billStatus | billStatusFilter}}
               </template>
+            </el-table-column> -->
+            <el-table-column align="left" label="发票号" prop="billReceipt" min-width="250" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{scope.row.billReceipt }}
+              </template>
             </el-table-column>
-               <el-table-column align="left" label="发票号" prop="billReceipt" min-width="250" show-overflow-tooltip>
-           <template slot-scope="scope">
-               {{scope.row.billReceipt }}
-            </template>
-          </el-table-column>
             <el-table-column align="left" label="出库单号" prop="id" min-width="110" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.id" />
@@ -210,19 +210,19 @@
             <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>-->
-<!--&lt;!&ndash;                <el-button type="text" @click="toExamine(scope.row)" v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'WAIT'">审批</el-button>&ndash;&gt;-->
-<!--&lt;!&ndash;                <el-popconfirm&ndash;&gt;-->
-<!--&lt;!&ndash;                   style="margin-left: 10px;"&ndash;&gt;-->
-<!--&lt;!&ndash;                  title="确定弃审吗？"&ndash;&gt;-->
-<!--&lt;!&ndash;                  @onConfirm="handleAbandon(scope.row.id)"&ndash;&gt;-->
-<!--&lt;!&ndash;                  v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'OK'" >&ndash;&gt;-->
-<!--&lt;!&ndash;                  <el-button slot="reference" type="text">弃审</el-button>&ndash;&gt;-->
-<!--&lt;!&ndash;                </el-popconfirm>&ndash;&gt;-->
-<!--              </template>-->
-<!--            </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>
+                <el-button type="text" @click="toExamine(scope.row)" v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'WAIT'">审批</el-button>
+                <el-popconfirm
+                  style="margin-left: 10px;"
+                  title="确定弃审吗？"
+                  @onConfirm="handleAbandon(scope.row.id)"
+                  v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'OK'" >
+                  <el-button slot="reference" type="text">弃审</el-button>
+                </el-popconfirm>
+             </template>
+           </el-table-column> -->
           </el-table>
         </div>
       </div>

src/views/supply/retail/retail_list.vue

@@ -161,6 +161,18 @@
               </template>
             </el-table-column>
             <el-table-column align="left" label="销售类型" prop="saleTypeName" 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="materialCode" min-width="120" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.materialCode" />

src/views/supply/sales/sales_list.vue

@@ -202,9 +202,9 @@
                 {{ scope.row.billReceipt }}
               </template>
             </el-table-column> -->
-            <!-- <el-table-column
+            <el-table-column
               align="left"
-              label="出库单号"
+              label="销售出库单号"
               prop="id"
               min-width="110"
               show-overflow-tooltip
@@ -213,19 +213,19 @@
                 <CopyButton :copyText="scope.row.id" />
                 <span>{{ scope.row.id }}</span>
               </template>
-            </el-table-column> -->
-                       <el-table-column align="left" label="发货单号" prop="orderNo" min-width="130" show-overflow-tooltip>
-                          <template slot-scope="scope">
-                           <CopyButton :copyText="scope.row.orderNo" />
-                           <span>{{scope.row.orderNo}}</span>
-                          </template>
-                      </el-table-column>
-            <!--            <el-table-column align="left" label="订单号" prop="orderNo" 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.orderType === 'HOME' ? scope.row.enginOrderNo : scope.row.mainOrderId}}</span>-->
-            <!--              </template>-->
-            <!--            </el-table-column>-->
+            </el-table-column>
+            <el-table-column align="left" label="发货单号" prop="orderNo" min-width="130" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.orderNo" />
+                <span>{{scope.row.orderNo}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="订单号" prop="orderNo" 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.orderType === 'HOME' ? scope.row.enginOrderNo : scope.row.mainOrderId}}</span>
+              </template>
+            </el-table-column>
             <el-table-column
               align="left"
               label="仓库"
@@ -319,21 +319,23 @@
               min-width="100"
               show-overflow-tooltip
             ></el-table-column>
-            <!--            <el-table-column align="right" 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="payAmount" min-width="100" show-overflow-tooltip>-->
-            <!--              <template slot-scope="scope">-->
-            <!--                {{ scope.row.payAmount | numToFixed }}-->
-            <!--              </template>-->
-            <!--            </el-table-column>-->
+
+            <!-- <el-table-column align="right" 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="payAmount" min-width="100" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.payAmount | numToFixed }}
+              </template>
+            </el-table-column> -->
             <!-- <el-table-column align="left" label="订单备注" prop="headerRemark" 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 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="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="操作"
@@ -389,8 +391,6 @@
       </div>
     </div>
 
-
-
     <ExamineDialog
       :isShow.sync="isShowExamineDialog"
       :examineForm.sync="examineForm"
@@ -422,7 +422,6 @@ import {
   examineJudge,
   getList,
   updateNum,
-
 } from "@/api/supply/sales";
 import SalesDetail from "@/views/supply/sales/components/sales_detail";
 import SalesExamine from "@/views/supply/sales/components/sales_examine";