销售返利单

src/views/finance/components/rebate_list-confirm.vue

@@ -38,23 +38,15 @@
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="审批人" prop="">
-              <el-input
-                v-if="this.searchForm.secondExamineBy != null"
-                disabled
-                v-model="searchForm.secondExamineBy"
-                placeholder=""
-              ></el-input>
+              <el-input v-if="this.searchForm.secondExamineBy != null" disabled v-model="searchForm.secondExamineBy"
+                placeholder=""></el-input>
               <el-input v-else disabled v-model="searchForm.examineBy" placeholder=""></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="审批日期" prop="">
-              <el-input
-                v-if="this.searchForm.secondExamineTime != null"
-                disabled
-                v-model="searchForm.secondExamineTime"
-                placeholder=""
-              ></el-input>
+              <el-input v-if="this.searchForm.secondExamineTime != null" disabled v-model="searchForm.secondExamineTime"
+                placeholder=""></el-input>
               <el-input v-else disabled v-model="searchForm.examineTime" placeholder=""></el-input>
             </el-form-item>
           </el-col>
@@ -64,23 +56,11 @@
     <!-- 列表 -->
     <div class="mymain-container">
       <div class="table">
-        <el-table
-          v-loading="listLoading"
-          :data="dataList"
-          element-loading-text="Loading"
-          border
-          fit
-          highlight-current-row
-          stripe
-        >
+        <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit
+          highlight-current-row stripe>
           <el-table-column label="序号" align="left" width="100" type="index" show-overflow-tooltip></el-table-column>
-          <el-table-column
-            align="left"
-            label="返利类型"
-            prop="walletName"
-            min-width="160"
-            show-overflow-tooltip
-          ></el-table-column>
+          <el-table-column align="left" label="返利类型" prop="walletName" min-width="160"
+            show-overflow-tooltip></el-table-column>
           <el-table-column align="right" label="总返利金额" prop="amount" min-width="160" show-overflow-tooltip>
             <!-- <template slot-scope="scope">
 
@@ -88,13 +68,8 @@
           </el-table-column>
           <el-table-column align="right" label="返利金额" prop="" min-width="160" show-overflow-tooltip>
             <template slot-scope="scope">
-              <el-input
-                style="width: 100%"
-                class="mountclass"
-                :disabled="show"
-                type="number"
-                v-model="scope.row.rebateAmount"
-              ></el-input>
+              <el-input style="width: 100%" class="mountclass" :disabled="show" type="number"
+                v-model="scope.row.rebateAmount"></el-input>
             </template>
           </el-table-column>
           <!--          <el-table-column align="right" label="折让金额" prop="" min-width="160" show-overflow-tooltip>-->
@@ -108,27 +83,17 @@
           <!--              ></el-input>-->
           <!--            </template>-->
           <!--          </el-table-column>-->
-<!--          <el-table-column-->
-<!--            align="left"-->
-<!--            label="备注"-->
-<!--            prop="policyDocNo"-->
-<!--            min-width="160"-->
-<!--            show-overflow-tooltip-->
-<!--          ></el-table-column>-->
-          <el-table-column
-            align="left"
-            label="备注1"
-            prop="remark1"
-            min-width="160"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            align="left"
-            label="备注2"
-            prop="remark2"
-            min-width="160"
-            show-overflow-tooltip
-          ></el-table-column>
+          <!--          <el-table-column-->
+          <!--            align="left"-->
+          <!--            label="备注"-->
+          <!--            prop="policyDocNo"-->
+          <!--            min-width="160"-->
+          <!--            show-overflow-tooltip-->
+          <!--          ></el-table-column>-->
+          <el-table-column align="left" label="备注1" prop="remark1" min-width="160"
+            show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="备注2" prop="remark2" min-width="160"
+            show-overflow-tooltip></el-table-column>
         </el-table>
       </div>
     </div>
@@ -170,12 +135,21 @@ export default {
     }
   },
   computed: {
+    
+    isCustomer() {
+      return this.$store.getters.customerId && this.$store.getters.customerNumber
+    },
     show() {
       if (this.isShow && this.examineStatus == 'OK_ONE') {
+        
         this.state = 1
+        if (this.isCustomer) {
+          return true
+        }
         return false
       } else if (!this.isShow) {
         this.state = 2
+        console.log(33);
         return false
       } else if (this.isShow && (this.examineStatus == 'OK' || this.examineStatus == 'FAIL')) {
         return true
@@ -274,8 +248,8 @@ export default {
       this.saveDataList = this.deepCopy(res.data.items)
       this.dataList = res.data.items
 
-      if (this.state !=1){
-        this.dataList.forEach(k=>{
+      if (this.state != 1) {
+        this.dataList.forEach(k => {
           k.rebateAmount = k.amount
         })
       }

src/views/finance/rebate_list.vue

@@ -546,11 +546,15 @@
                       scope.row.examineStatus == 'FAIL')
                   "
                   @click="confirmFn(scope.row.rebateOrderId, scope.row.customerIsConfirm)"
-                  >{{
-                    scope.row.customerIsConfirm == true && scope.row.examineStatus == 'OK_ONE'
+                  >
+                  <!-- scope.row.customerIsConfirm == true && scope.row.examineStatus == 'OK_ONE' && isConfirm
                       ? '编辑'
                       : scope.row.customerIsConfirm == false
                       ? '确定'
+                      : '详情' -->
+                  {{
+                    scope.row.customerIsConfirm == false
+                      ? '确定'
                       : '详情'
                   }}</el-button
                 >

src/views/supply/deliver/home_list.vue

@@ -9,7 +9,7 @@
             <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>
           </template>
           <template #search>
-            <el-form ref="screenForm" :model="screenForm" label-width="85px" size="mini" label-position="left">
+            <el-form ref="screenForm" :model="screenForm" label-width="120px" size="mini" label-position="left">
               <el-row :gutter="20">
                 <!-- <el-col :xs="24" :sm="24" :lg="24">
                   <el-form-item prop="orderNum" label-width="0">
@@ -31,8 +31,8 @@
                   </el-form-item>
                 </el-col>
                 <el-col :xs="24" :sm="12" :lg="6">
-                  <el-form-item label="合同号" prop="contractNo">
-                    <el-input v-model="screenForm.contractNo" placeholder="请输入合同号"></el-input>
+                  <el-form-item label="工程登录编号" prop="contractNo">
+                    <el-input v-model="screenForm.contractNo" placeholder="请输入工程登录编号"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :xs="24" :sm="12" :lg="6">
@@ -148,7 +148,7 @@
             </el-table-column>
             <el-table-column
               align="left"
-              label="工程信息单号"
+              label="工程登录编号"
               prop="refEnginRecordNo"
               min-width="150"
               show-overflow-tooltip