【修改】bug

src/views/deposit_commerce/refund_list.vue

@@ -5,7 +5,7 @@
         <el-radio-button label="">全部</el-radio-button>
         <el-radio-button label="SAVE">保存</el-radio-button>
         <el-radio-button label="WAIT">待审核</el-radio-button>
-        <el-radio-button label="FAIL">审核驳回</el-radio-button>
+        <!--   <el-radio-button label="FAIL">审核驳回</el-radio-button> -->
         <el-radio-button label="OK">审核通过</el-radio-button>
       </el-radio-group>
       <br /><br />
@@ -292,7 +292,7 @@
                 <span>{{scope.row.customerName}}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="厂编号" prop="refFactoryNo" min-width="260" show-overflow-tooltip>
+            <el-table-column align="left" label="跨厂区标号" prop="refFactoryNo" min-width="260" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.refFactoryNo" />
                 <span>{{scope.row.refFactoryNo}}</span>
@@ -302,7 +302,7 @@
             </el-table-column>
               <el-table-column align="right" label="特价编号" prop="specialNo" min-width="160" show-overflow-tooltip>
             </el-table-column>
-            <el-table-column align="left" label="行业类别" prop="refTradeCategory" min-width="160" show-overflow-tooltip>
+            <el-table-column align="left" label="项目类别" prop="refTradeCategory" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.refTradeCategory" />
                 <span>{{scope.row.refTradeCategory}}</span>
@@ -354,8 +354,8 @@
                 {{ scope.row.depositAmount | numToFixed }}
               </template>
             </el-table-column>
-            <el-table-column align="right" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip>
-            </el-table-column>
+            <!-- <el-table-column align="right" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip>
+            </el-table-column> -->
 
 
             <el-table-column align="right" label="安装日期" prop="installDate" min-width="160" show-overflow-tooltip>

src/views/deposit_home/refund_list.vue

@@ -5,7 +5,7 @@
         <el-radio-button label="">全部</el-radio-button>
         <el-radio-button label="SAVE">保存</el-radio-button>
         <el-radio-button label="WAIT">待审核</el-radio-button>
-        <el-radio-button label="FAIL">审核驳回</el-radio-button>
+        <!--    <el-radio-button label="FAIL">审核驳回</el-radio-button> -->
         <el-radio-button label="OK">审核通过</el-radio-button>
       </el-radio-group>
       <br /><br />
@@ -292,7 +292,7 @@
                 <span>{{scope.row.customerName}}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="厂编号" prop="refFactoryNo" min-width="260" show-overflow-tooltip>
+            <el-table-column align="left" label="跨厂区编号" prop="refFactoryNo" min-width="260" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.refFactoryNo" />
                 <span>{{scope.row.refFactoryNo}}</span>
@@ -302,7 +302,7 @@
             </el-table-column>
               <el-table-column align="right" label="特价编号" prop="specialNo" min-width="160" show-overflow-tooltip>
             </el-table-column>
-            <el-table-column align="left" label="行业类别" prop="refTradeCategory" min-width="160" show-overflow-tooltip>
+            <el-table-column align="left" label="项目类别" prop="refTradeCategory" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.refTradeCategory" />
                 <span>{{scope.row.refTradeCategory}}</span>
@@ -354,8 +354,8 @@
                 {{ scope.row.depositAmount | numToFixed }}
               </template>
             </el-table-column>
-            <el-table-column align="right" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip>
-            </el-table-column>
+            <!-- <el-table-column align="right" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip>
+            </el-table-column> -->
 
 
             <el-table-column align="right" label="安装日期" prop="installDate" min-width="160" show-overflow-tooltip>

src/views/engin_deposit/refund_list.vue

@@ -5,7 +5,7 @@
         <el-radio-button label="">全部</el-radio-button>
         <el-radio-button label="SAVE">保存</el-radio-button>
         <el-radio-button label="WAIT">待审核</el-radio-button>
-        <el-radio-button label="FAIL">审核驳回</el-radio-button>
+          <!-- <el-radio-button label="FAIL">审核驳回</el-radio-button> -->
         <el-radio-button label="OK">审核通过</el-radio-button>
       </el-radio-group>
       <br /><br />

src/views/finance/change_list.vue

@@ -5,7 +5,7 @@
         <el-radio-button label="">全部</el-radio-button>
         <el-radio-button label="WAIT">待审核</el-radio-button>
         <el-radio-button label="OK_ONE">审核通过</el-radio-button>
-        <el-radio-button label="FAIL_ONE">审核驳回</el-radio-button>
+        <!-- <el-radio-button label="FAIL_ONE">审核驳回</el-radio-button> -->
         <!-- <el-radio-button label="复核通过"></el-radio-button>
         <el-radio-button label="待复核"></el-radio-button>
         <el-radio-button label="复核驳回"></el-radio-button> -->

src/views/finance/receivable_list.vue

@@ -5,7 +5,7 @@
         <el-radio-button label="">全部</el-radio-button>
         <el-radio-button label="WAIT">待审核</el-radio-button>
         <el-radio-button label="OK">审核通过</el-radio-button>
-        <el-radio-button label="FAIL">审核驳回</el-radio-button>
+          <!-- <el-radio-button label="FAIL">审核驳回</el-radio-button> -->
       </el-radio-group>
       <br /><br />
       <!-- 筛选条件 -->

src/views/finance/standbook_list.vue

@@ -479,6 +479,7 @@ export default {
   created() {
 
     // console.log(
+    
     //   this.customerId,
     //   this.$store.state.user.customerName,
     //   this.$store.state.user.customerNumber,

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/components/apply_detail.vue

@@ -82,12 +82,12 @@
       </div>
 
       <div class="table" style="margin-top: 20px">
-        <el-table 
-          :data="detailData.orders" 
-          element-loading-text="Loading" 
-          border 
-          fit 
-          highlight-current-row 
+        <el-table
+          :data="detailData.orders"
+          element-loading-text="Loading"
+          border
+          fit
+          highlight-current-row
           stripe
           show-summary
           :summary-method="$getSummaries">
@@ -151,7 +151,7 @@
           </el-row>
         </div>
       </div>
-      
+
       <div class="page-footer">
         <div class="footer">
           <el-button  type="primary" icon="el-icon-printer" @click="toPrint" :disabled="detailData.examineStatus !== 'OK'">打 印</el-button>
@@ -160,7 +160,7 @@
           </el-popconfirm>
         </div>
       </div>
-    
+
     </div>
 
     <CommonPrint :printId="printId" :printType="printType" v-if="isShowPrint" @backDetail="backDetail" />
@@ -186,7 +186,7 @@ export default {
         { label: '已保存', value: 'SAVE' },
         { label: '待审核', value: 'WAIT' },
         { label: '审核通过', value: 'OK' },
-        { label: '审核驳回', value: 'FAIL' },
+         // { label: '审核驳回', value: 'FAIL' },,
         { label: '已关闭', value: 'CLOSE' },
       ];
       let obj = statusList.find(o => o.value == val);
@@ -293,4 +293,4 @@ export default {
       padding-left: 10px;
     }
   }
-</style>
+</style>

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

@@ -173,7 +173,7 @@ export default {
         { label: '已保存', value: 'SAVE' },
         { label: '待审核', value: 'WAIT' },
         { label: '审核通过', value: 'OK' },
-        { label: '审核驳回', value: 'FAIL' },
+         // { label: '审核驳回', value: 'FAIL' },,
         { label: '已关闭', value: 'CLOSE' },
       ];
       let obj = statusList.find(o => o.value == val);

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

@@ -224,7 +224,7 @@ export default {
         { label: '已保存', value: 'SAVE' },
         { label: '待审核', value: 'WAIT' },
         { label: '审核通过', value: 'OK' },
-        { label: '审核驳回', value: 'FAIL' },
+         // { label: '审核驳回', value: 'FAIL' },,
         { label: '已关闭', value: 'CLOSE' },
       ];
       let obj = statusList.find(o => o.value == val);

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

@@ -199,7 +199,7 @@ export default {
         { label: '已保存', value: 'SAVE' },
         { label: '待审核', value: 'WAIT' },
         { label: '审核通过', value: 'OK' },
-        { label: '审核驳回', value: 'FAIL' },
+         // { label: '审核驳回', value: 'FAIL' },,
         { label: '已关闭', value: 'CLOSE' },
       ];
       let obj = statusList.find(o => o.value == val);

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

@@ -455,9 +455,11 @@ export default {
   methods: {
     // 返回列表
     goBack() {
-
-         this.$emit('backListFormDetail');
-
+        if(this.$parent.isShow){
+          this.$router.replace('/supply/implement/sum_list')
+        }else{
+            this.$emit('backListFormDetail');
+        }
 
     },
 

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: [
@@ -392,6 +392,7 @@ export default {
         status: '',
         remark: '',
       },
+      isShow:false
     }
   },
 
@@ -424,7 +425,14 @@ export default {
     this.getSalesmanList();
     this.getList();
   },
-
+  activated() {
+    // keepAlice  activated 主要是从发货单汇总调用退货申请按钮
+    this.isShow = false
+    if(this.$route.query && this.$route.query.isShow){
+      this.isShow = this.$route.query.isShow
+        this.toReturnForm()
+    }
+  },
   methods: {
     // 获取业务员列表
     getSalesmanList() {

src/views/supply/deliver/components/commerce_detail.vue

@@ -112,11 +112,11 @@
       </div>
       <div class="table">
         <el-table
-          :data="detailData.invoicePickBeans" 
-          element-loading-text="Loading" 
-          border 
-          fit 
-          highlight-current-row 
+          :data="detailData.invoicePickBeans"
+          element-loading-text="Loading"
+          border
+          fit
+          highlight-current-row
           stripe
           show-summary
           :summary-method="$getSummaries">
@@ -200,7 +200,7 @@ export default {
         { label: '已保存', value: 'SAVE' },
         { label: '待审核', value: 'WAIT' },
         { label: '审核通过', value: 'OK' },
-        { label: '审核驳回', value: 'FAIL' },
+         // { label: '审核驳回', value: 'FAIL' },,
       ]
       let obj = statusList.find(o => o.value == val);
       return obj ? obj.label : ''
@@ -287,4 +287,4 @@ export default {
       padding-left: 10px;
     }
   }
-</style>
+</style>

src/views/supply/deliver/components/deliver_detail.vue

@@ -112,11 +112,11 @@
       </div>
       <div class="table">
         <el-table
-          :data="detailData.invoicePickBeans" 
-          element-loading-text="Loading" 
-          border 
-          fit 
-          highlight-current-row 
+          :data="detailData.invoicePickBeans"
+          element-loading-text="Loading"
+          border
+          fit
+          highlight-current-row
           stripe
           show-summary
           :summary-method="$getSummaries">
@@ -168,7 +168,7 @@
         </el-table>
       </div>
 
-    
+
       <div class="page-footer">
         <div class="footer">
           <el-button  type="primary" icon="el-icon-printer" @click="toPrint">打 印</el-button>
@@ -202,7 +202,7 @@ export default {
         { label: '已保存', value: 'SAVE' },
         { label: '待审核', value: 'WAIT' },
         { label: '审核通过', value: 'OK' },
-        { label: '审核驳回', value: 'FAIL' },
+         // { label: '审核驳回', value: 'FAIL' },,
       ]
       let obj = statusList.find(o => o.value == val);
       return obj ? obj.label : ''
@@ -289,4 +289,4 @@ export default {
       padding-left: 10px;
     }
   }
-</style>
+</style>

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

@@ -112,11 +112,11 @@
       </div>
       <div class="table">
         <el-table
-          :data="detailData.invoicePickBeans" 
-          element-loading-text="Loading" 
-          border 
-          fit 
-          highlight-current-row 
+          :data="detailData.invoicePickBeans"
+          element-loading-text="Loading"
+          border
+          fit
+          highlight-current-row
           stripe
           show-summary
           :summary-method="$getSummaries">
@@ -201,7 +201,7 @@ export default {
         { label: '已保存', value: 'SAVE' },
         { label: '待审核', value: 'WAIT' },
         { label: '审核通过', value: 'OK' },
-        { label: '审核驳回', value: 'FAIL' },
+         // { label: '审核驳回', value: 'FAIL' },,
       ]
       let obj = statusList.find(o => o.value == val);
       return obj ? obj.label : ''
@@ -288,4 +288,4 @@ export default {
       padding-left: 10px;
     }
   }
-</style>
+</style>

src/views/supply/deliver/components/sum_print.vue

@@ -114,11 +114,11 @@ export default {
             }
 
       })
-        console.log(ids,'kkk');
-      addPrint({ ids: ids.join(',') }).then(res => {
-        // this.$successMsg('提交成功');
-         this.$parent.getList()
-      })
+      console.log(document.execCommand,'4545');
+      // addPrint({ ids: ids.join(',') }).then(res => {
+      //   // this.$successMsg('提交成功');
+      //    this.$parent.getList()
+      // })
     }
   }
 }

src/views/supply/deliver/sum_list.vue

@@ -109,8 +109,9 @@
           </div>
           <!--  -->
           <div class="fr" style="display: flex;">
-            <el-button size="mini" type="primary" v-if="$checkBtnRole('refund', $route.meta.roles)"  style="margin-right: 10px;" icon="el-icon-plus" @click="$router.push('/supply/deliver/apply_list?isShow=true')">退货申请</el-button>
-            <ExportButton :exUrl="'invoice/exportInvoice'" :exParams="exParams" />
+            <el-button size="mini" type="primary" v-if="$checkBtnRole('refund', $route.meta.roles)"  style="margin-right: 10px;" icon="el-icon-plus" @click="$router.push('/supply/deliver/apply_list?isShow=true')">零售退货申请</el-button>
+            <el-button size="mini" type="primary" v-if="$checkBtnRole('refund', $route.meta.roles)"  style="margin-right: 10px;" icon="el-icon-plus" @click="$router.push('/supply/deliver/engin_list?isShow=true')">工程退货申请</el-button>
+           <ExportButton :exUrl="'invoice/exportInvoice'" :exParams="exParams" />
           </div>
         </div>
         <div class="table">

src/views/supply/direct/components/direct_detail.vue

@@ -160,7 +160,7 @@
         </el-row>
       </div>
     </div>
-    
+
     <div class="page-footer">
       <div class="footer" :class="classObj">
         <el-button @click="goBack">关 闭</el-button>
@@ -183,7 +183,7 @@ export default {
         { label: '已保存', value: 'SAVE' },
         { label: '待审核', value: 'WAIT' },
         { label: '审核通过', value: 'OK' },
-        { label: '审核驳回', value: 'FAIL' },
+         // { label: '审核驳回', value: 'FAIL' },,
         { label: '已关闭', value: 'CLOSE' },
       ];
       let obj = MAP.find(o => o.value == val);
@@ -267,4 +267,4 @@ export default {
       padding-left: 10px;
     }
   }
-</style>
+</style>

src/views/supply/direct/components/direct_examine.vue

@@ -122,7 +122,7 @@
         </el-col>
       </el-row>
     </div>
-    
+
     <div class="page-footer">
       <div class="footer" :class="classObj">
         <el-button type="primary" @click="clickSubmitForm('OK')">审批通过</el-button>
@@ -149,7 +149,7 @@ export default {
         { label: '已保存', value: 'SAVE' },
         { label: '待审核', value: 'WAIT' },
         { label: '审核通过', value: 'OK' },
-        { label: '审核驳回', value: 'FAIL' },
+         // { label: '审核驳回', value: 'FAIL' },,
         { label: '已关闭', value: 'CLOSE' },
       ];
       let obj = MAP.find(o => o.value == val);
@@ -228,7 +228,7 @@ export default {
         this.detailData = res.data;
       })
     },
-    
+
     // 提交审批
     clickSubmitForm(val) {
       this.$confirm('此操作将审批订单, 是否继续?', '提示', {
@@ -280,4 +280,4 @@ export default {
   ::v-deep input[type='number'] {
     -moz-appearance: textfield;
   }
-</style>
+</style>

src/views/supply/direct/components/direct_form.vue

@@ -28,7 +28,7 @@
           <el-form-item label="状态" prop="examineStatus">
             <el-select v-model="mainForm.examineStatus" style="width: 100%;" disabled>
               <el-option
-                v-for="(item, index) in statusList" 
+                v-for="(item, index) in statusList"
                 :key="index"
                 :label="item.label"
                 :value="item.value">
@@ -55,7 +55,7 @@
           <el-form-item label="销售单类型" prop="orderType">
             <el-select v-model="mainForm.orderType" style="width: 100%;" disabled>
               <el-option
-                v-for="(item, index) in orderTypeList" 
+                v-for="(item, index) in orderTypeList"
                 :key="index"
                 :label="item.label"
                 :value="item.value">
@@ -67,7 +67,7 @@
           <el-form-item label="调拨类型" prop="type">
             <el-select v-model="mainForm.type" style="width: 100%;" disabled>
               <el-option
-                v-for="(item, index) in typeList" 
+                v-for="(item, index) in typeList"
                 :key="index"
                 :label="item.label"
                 :value="item.value">
@@ -187,7 +187,7 @@
         <el-table-column align="center" label="备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
       </el-table>
     </div>
-    
+
     <div class="page-footer">
       <div class="footer" :class="classObj">
         <el-button type="primary" @click="clickSubmitForm('SAVE')">保 存</el-button>
@@ -214,7 +214,7 @@ export default {
         { label: '已保存', value: 'SAVE' },
         { label: '待审核', value: 'WAIT' },
         { label: '审核通过', value: 'OK' },
-        { label: '审核驳回', value: 'FAIL' },
+         // { label: '审核驳回', value: 'FAIL' },,
         { label: '已关闭', value: 'CLOSE' },
       ],
       orderTypeList: [
@@ -241,7 +241,7 @@ export default {
       warehouseList2: [],
       positionList1: [],
       positionList2: [],
-      
+
     }
   },
 
@@ -383,4 +383,4 @@ export default {
       padding-left: 10px;
     }
   }
-</style>
+</style>

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/displace/components/displace_return.vue

@@ -170,7 +170,7 @@ export default {
         { label: '已保存', value: 'SAVE' },
         { label: '待审核', value: 'WAIT' },
         { label: '审核通过', value: 'OK' },
-        { label: '审核驳回', value: 'FAIL' },
+         // { label: '审核驳回', value: 'FAIL' },,
         { label: '已关闭', value: 'CLOSE' },
       ];
       let obj = statusList.find(o => o.value == val);

src/views/supply/engin/commerce_list.vue

@@ -353,7 +353,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/components/commerce_detail.vue

@@ -376,7 +376,7 @@ export default {
         { label: '已保存', value: 'SAVE' },
         { label: '待审核', value: 'WAIT' },
         { label: '审核通过', value: 'OK' },
-        { label: '审核驳回', value: 'FAIL' },
+         // { label: '审核驳回', value: 'FAIL' },,
         { label: '已关闭', value: 'CLOSE' },
       ];
       let obj = statusList.find(o => o.value == val);

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

@@ -241,7 +241,7 @@ export default {
         { label: '已保存', value: 'SAVE' },
         { label: '待审核', value: 'WAIT' },
         { label: '审核通过', value: 'OK' },
-        { label: '审核驳回', value: 'FAIL' },
+         // { label: '审核驳回', value: 'FAIL' },,
         { label: '已关闭', value: 'CLOSE' },
       ];
       let obj = statusList.find(o => o.value == val);

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

@@ -229,7 +229,7 @@ export default {
         { label: '已保存', value: 'SAVE' },
         { label: '待审核', value: 'WAIT' },
         { label: '审核通过', value: 'OK' },
-        { label: '审核驳回', value: 'FAIL' },
+         // { label: '审核驳回', value: 'FAIL' },,
         { label: '已关闭', value: 'CLOSE' },
       ];
       let obj = statusList.find(o => o.value == val);

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

@@ -192,7 +192,7 @@ export default {
         { label: '已保存', value: 'SAVE' },
         { label: '待审核', value: 'WAIT' },
         { label: '审核通过', value: 'OK' },
-        { label: '审核驳回', value: 'FAIL' },
+         // { label: '审核驳回', value: 'FAIL' },,
         { label: '已关闭', value: 'CLOSE' },
       ];
       let obj = statusList.find(o => o.value == val);

src/views/supply/engin/components/engin_examine.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' },
       ];
       let obj = statusList.find(o => o.value == val);

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

@@ -367,7 +367,7 @@ export default {
         { label: '已保存', value: 'SAVE' },
         { label: '待审核', value: 'WAIT' },
         { label: '审核通过', value: 'OK' },
-        { label: '审核驳回', value: 'FAIL' },
+         // { label: '审核驳回', value: 'FAIL' },,
         { label: '已关闭', value: 'CLOSE' },
       ];
       let obj = statusList.find(o => o.value == val);

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

@@ -324,7 +324,7 @@ export default {
         { label: '已保存', value: 'SAVE' },
         { label: '待审核', value: 'WAIT' },
         { label: '审核通过', value: 'OK' },
-        { label: '审核驳回', value: 'FAIL' },
+         // { label: '审核驳回', value: 'FAIL' },,
         { label: '已关闭', value: 'CLOSE' },
       ];
       let obj = statusList.find(o => o.value == val);

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

@@ -238,7 +238,7 @@ export default {
         { label: '已保存', value: 'SAVE' },
         { label: '待审核', value: 'WAIT' },
         { label: '审核通过', value: 'OK' },
-        { label: '审核驳回', value: 'FAIL' },
+         // { label: '审核驳回', value: 'FAIL' },,
         { label: '已关闭', value: 'CLOSE' },
       ];
       let obj = statusList.find(o => o.value == val);

src/views/supply/engin/engin_list.vue

@@ -315,7 +315,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

@@ -370,7 +370,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/implement/components/sales_detail.vue

@@ -106,7 +106,7 @@
         </el-row>
       </div>
     </div>
-    
+
 
 
   </div>
@@ -129,7 +129,7 @@ export default {
         { label: '已保存', value: 'SAVE' },
         { label: '待审核', value: 'WAIT' },
         { label: '审核通过', value: 'OK' },
-        { label: '审核驳回', value: 'FAIL' },
+         // { label: '审核驳回', value: 'FAIL' },,
       ];
       let obj = statusList.find(o => o.value == val);
       return obj ? obj.label : ''
@@ -175,4 +175,4 @@ export default {
     width: 100%;
     height: 100%;
   }
-</style>
+</style>

src/views/supply/implement/components/sales_examine.vue

@@ -93,7 +93,7 @@
         </el-col>
       </el-row>
     </div>
-    
+
     <div class="page-footer">
       <div class="footer">
         <el-button type="primary" @click="clickSubmitForm('OK')">审批通过</el-button>
@@ -120,7 +120,7 @@ export default {
         { label: '已保存', value: 'SAVE' },
         { label: '待审核', value: 'WAIT' },
         { label: '审核通过', value: 'OK' },
-        { label: '审核驳回', value: 'FAIL' },
+         // { label: '审核驳回', value: 'FAIL' },,
       ];
       let obj = statusList.find(o => o.value == val);
       return obj ? obj.label : ''
@@ -221,4 +221,4 @@ export default {
       padding-left: 10px;
     }
   }
-</style>
+</style>

src/views/supply/implement/nsales_list.vue

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

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

@@ -649,7 +649,7 @@ export default {
         { label: '已保存', value: 'SAVE' },
         { label: '待审核', value: 'WAIT' },
         { label: '审核通过', value: 'OK' },
-        { label: '审核驳回', value: 'FAIL' }
+         // { label: '审核驳回', value: 'FAIL' },
       ]
       const obj = statusList.find((o) => o.value === val)
       if (!time) {

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

@@ -147,7 +147,7 @@ export default {
         { label: '已保存', value: 'SAVE' },
         { label: '待审核', value: 'WAIT' },
         { label: '审核通过', value: 'OK' },
-        { label: '审核驳回', value: 'FAIL' },
+         // { label: '审核驳回', value: 'FAIL' },,
       ];
       let obj = statusList.find(o => o.value == val);
       return obj ? obj.label : ''

src/views/supply/policy/policy_list.vue

@@ -651,7 +651,7 @@ export default {
         { label: '已保存', value: 'SAVE' },
         { label: '待审核', value: 'WAIT' },
         { label: '审核通过', value: 'OK' },
-        { label: '审核驳回', value: 'FAIL' }
+         // { label: '审核驳回', value: 'FAIL' },
       ],
       queryItem: {},
       isShowDetail: false,

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

@@ -320,7 +320,7 @@ export default {
         { label: '已保存', value: 'SAVE' },
         { label: '待审核', value: 'WAIT' },
         { label: '审核通过', value: 'OK' },
-        { label: '审核驳回', value: 'FAIL' },
+         // { label: '审核驳回', value: 'FAIL' },,
       ];
       let obj = statusList.find(o => o.value == val);
       return obj ? obj.label : ''

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

@@ -99,7 +99,7 @@
 
     <div class="main-title">
       <div class="title">审批信息</div>
-    </div> 
+    </div>
     <div class="diy-table-1">
       <el-row :gutter="0">
         <el-col :span="12" class="item">
@@ -121,7 +121,7 @@
         </el-col>
       </el-row>
     </div>
-    
+
     <div class="page-footer">
       <div class="footer">
         <el-button type="primary" @click="clickSubmitForm" :loading="formLoading">{{ formLoading ? '提交中 ...' : '提 交' }}</el-button>
@@ -145,7 +145,7 @@ export default {
         { label: '已保存', value: 'SAVE' },
         { label: '待审核', value: 'WAIT' },
         { label: '审核通过', value: 'OK' },
-        { label: '审核驳回', value: 'FAIL' },
+         // { label: '审核驳回', value: 'FAIL' },,
       ];
       let obj = statusList.find(o => o.value == val);
       return obj ? obj.label : ''
@@ -226,4 +226,4 @@ export default {
       padding-left: 10px;
     }
   }
-</style>
+</style>

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

@@ -116,7 +116,7 @@
 
     <div class="main-title">
       <div class="title">退订信息</div>
-    </div> 
+    </div>
     <div class="diy-table-1">
       <el-row :gutter="0">
         <el-col :span="12" class="item">
@@ -133,7 +133,7 @@
         </el-col> -->
       </el-row>
     </div>
-    
+
     <div class="page-footer">
       <div class="footer" :class="classObj">
         <el-button type="primary" @click="clickSubmitForm" :loading="formLoading">{{ formLoading ? '提交中 ...' : '提 交' }}</el-button>
@@ -157,7 +157,7 @@ export default {
         { label: '已保存', value: 'SAVE' },
         { label: '待审核', value: 'WAIT' },
         { label: '审核通过', value: 'OK' },
-        { label: '审核驳回', value: 'FAIL' },
+         // { label: '审核驳回', value: 'FAIL' },,
       ];
       let obj = statusList.find(o => o.value == val);
       return obj ? obj.label : ''
@@ -277,4 +277,4 @@ export default {
       padding-left: 10px;
     }
   }
-</style>
+</style>

src/views/supply/sales/components/sales_detail.vue

@@ -106,7 +106,7 @@
         </el-row>
       </div>
     </div>
-    
+
 
 
   </div>
@@ -129,7 +129,7 @@ export default {
         { label: '已保存', value: 'SAVE' },
         { label: '待审核', value: 'WAIT' },
         { label: '审核通过', value: 'OK' },
-        { label: '审核驳回', value: 'FAIL' },
+         // { label: '审核驳回', value: 'FAIL' },,
       ];
       let obj = statusList.find(o => o.value == val);
       return obj ? obj.label : ''
@@ -175,4 +175,4 @@ export default {
     width: 100%;
     height: 100%;
   }
-</style>
+</style>

src/views/supply/sales/components/sales_examine.vue

@@ -93,7 +93,7 @@
         </el-col>
       </el-row>
     </div>
-    
+
     <div class="page-footer">
       <div class="footer">
         <el-button type="primary" @click="clickSubmitForm('OK')">审批通过</el-button>
@@ -120,7 +120,7 @@ export default {
         { label: '已保存', value: 'SAVE' },
         { label: '待审核', value: 'WAIT' },
         { label: '审核通过', value: 'OK' },
-        { label: '审核驳回', value: 'FAIL' },
+         // { label: '审核驳回', value: 'FAIL' },,
       ];
       let obj = statusList.find(o => o.value == val);
       return obj ? obj.label : ''
@@ -221,4 +221,4 @@ export default {
       padding-left: 10px;
     }
   }
-</style>
+</style>

src/views/supply/sales/sales_list.vue

@@ -177,7 +177,7 @@
 <!--                {{ 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="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>-->
@@ -273,7 +273,7 @@ export default {
         { label: '已保存', value: 'SAVE' },
         { label: '待审核', value: 'WAIT' },
         { label: '审核通过', value: 'OK' },
-        { label: '审核驳回', value: 'FAIL' },
+         // { label: '审核驳回', value: 'FAIL' },,
       ],
 
       queryItem: {},