返利单更改完成

src/views/basic_data/material/components/modify_list-apply.vue

@@ -1046,6 +1046,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         keyword: "",
+        bindMain: true,
       };
       getMaterialList(params).then((res) => {
         this.materialLis = res.data.records;
@@ -1070,6 +1071,7 @@ export default {
         pageNum: this.currentPage,
         pageSize: 5 || this.pageSize,
         keyword: this.screenForm.keyword,
+        bindMain: true,
       };
       getMaterialList(params).then((res) => {
         this.dataList = res.data.records;
@@ -1078,9 +1080,6 @@ export default {
       });
     },
     hanleSbumit() {
-
-
-
       for (let i = 0; i < this.items.length; i++) {
         this.items[i].wallets = [
           ...this.items[i].rebateWallets,
@@ -1108,8 +1107,8 @@ export default {
         this.$successMsg("成功");
         getProductRriceDetail({ id: res.data }).then((res) => {
           this.base.billId = res.data.billId;
-          this.$parent.show = 1
-          this.$parent.getList()
+          this.$parent.show = 1;
+          this.$parent.getList();
         });
       });
     },

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

@@ -303,9 +303,9 @@
             min-width="160"
             show-overflow-tooltip
           >
-            <template slot-scope="scope">
+            <!-- <template slot-scope="scope">
               <el-input v-model="scope.row.allowanceCode"></el-input>
-            </template>
+            </template> -->
           </el-table-column>
           <el-table-column
             align="center"
@@ -314,9 +314,9 @@
             min-width="160"
             show-overflow-tooltip
           >
-            <template slot-scope="scope">
+            <!-- <template slot-scope="scope">
               <el-input v-model="scope.row.allowanceAccount"></el-input>
-            </template>
+            </template> -->
           </el-table-column>
           <el-table-column
             align="center"
@@ -440,10 +440,17 @@ export default {
       this.dataList2 = res.data.items;
       this.examineBy = res.data.examineBy;
       this.examineRemark = res.data.examineRemark;
-      if (res.data.examineStatus == "OK_ONE") {
+
+      if (
+        res.data.examineStatus == "OK_ONE" ||
+        res.data.examineStatus == "OK"
+      ) {
         this.examineStatus = "OK";
       }
-      if (res.data.examineStatus == "FAIL_ONE") {
+      if (
+        res.data.examineStatus == "FAIL_ONE" ||
+        res.data.examineStatus == "FAIL"
+      ) {
         this.examineStatus = "FAIL";
       }
     },

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

@@ -199,32 +199,34 @@
         </el-table>
       </div>
     </div>
-    <span>审批记录</span>
-    <el-divider></el-divider>
-    <div class="diy-table-1">
-      <el-row :gutter="0">
-        <el-col :span="12" class="item">
-          <div class="label">审批人</div>
-          <div class="value">{{ examineBy }}</div>
-        </el-col>
-        <el-col :span="12" class="item">
-          <div class="label">审批结果</div>
-          <div class="value">
-            <el-radio v-model="examineStatus" label="OK">通过</el-radio>
-            <el-radio v-model="examineStatus" label="FAIL">驳回</el-radio>
-          </div>
-        </el-col>
-        <el-col :span="24" class="item">
-          <div class="label">审批说明</div>
-          <div class="value">
-            <el-input
-              v-model="examineRemark"
-              placeholder="请输入内容"
-            ></el-input>
-          </div>
-        </el-col>
-      </el-row>
-    </div>
+    <!-- <div v-if="isShow">
+      <span>审批记录</span>
+      <el-divider></el-divider>
+      <div class="diy-table-1">
+        <el-row :gutter="0">
+          <el-col :span="12" class="item">
+            <div class="label">审批人</div>
+            <div class="value">{{ examineBy }}</div>
+          </el-col>
+          <el-col :span="12" class="item">
+            <div class="label">审批结果</div>
+            <div class="value">
+              <el-radio v-model="examineStatus" label="OK">通过</el-radio>
+              <el-radio v-model="examineStatus" label="FAIL">驳回</el-radio>
+            </div>
+          </el-col>
+          <el-col :span="24" class="item">
+            <div class="label">审批说明</div>
+            <div class="value">
+              <el-input
+                v-model="examineRemark"
+                placeholder="请输入内容"
+              ></el-input>
+            </div>
+          </el-col>
+        </el-row>
+      </div>
+    </div> -->
   </div>
 </template>
 
@@ -248,6 +250,7 @@ export default {
       examineBy: "",
       examineRemark: "",
       examineStatus: "",
+      isShow: false,
     };
   },
   created() {
@@ -269,12 +272,12 @@ export default {
       this.dataList = res.data.items;
       this.examineBy = res.data.examineBy;
       this.examineRemark = res.data.examineRemark;
-      if (res.data.examineStatus == "OK_ONE") {
-        this.examineStatus = "OK";
-      }
-      if (res.data.examineStatus == "FAIL_ONE") {
-        this.examineStatus = "FAIL";
-      }
+      // if (
+      //   res.data.examineStatus == "SAVE" ||
+      //   res.data.examineStatus == "WAIT"
+      // ) {
+      //   this.isShow = false;
+      // }
     },
   },
 };