议价部分

src/views/sellOut/bargainList/detail.vue

@@ -153,13 +153,14 @@
             <el-collapse-item
               title="业务部门审批"
               name="2"
-              v-if="status == '1' && powers.some((item) => item == '043')"
+              v-if="status == '0' && powers.some((item) => item == '043')"
             >
-              <exam-form
+              <exam-formss
                 :statusList="[]"
                 :newTime="newTime"
                 :disabled="false"
                 :isMust="false"
+                
                 @searchChange="examForm($event, 1, '业务部门')"
               />
             </el-collapse-item>
@@ -168,9 +169,11 @@
               name="3"
               v-if="status == '2' && powers.some((item) => item == '058')"
             >
-              <exam-form
+              <exam-formss
                 :statusList="[]"
                 :newTime="newTime"
+                :remarkTxt="sitem.remark"
+                remarkTitle="业务主管"
                 :disabled="false"
                 :isMust="false"
                 @searchChange="examForm($event, 2, '财务专员')"
@@ -179,31 +182,51 @@
             <el-collapse-item
               title="财务主管审批"
               name="4"
-              v-if="status == '3' && powers.some((item) => item == '059')"
+              v-if="status == '4' && powers.some((item) => item == '059')"
             >
-              <exam-form
+              <exam-formss
                 :statusList="[]"
                 :newTime="newTime"
+                :remarkTxt="sitem.remark"
+                remarkTitle="财务专员"
                 :disabled="false"
                 :isMust="false"
                 @searchChange="examForm($event, 3, '财务主管')"
               />
             </el-collapse-item>
 
-
-              <!-- 需修改item == 059条件 -->
             <el-collapse-item
               title="BOSS审批"
-              name="5"                         
-              
-              v-if="status == '8' && powers.some((item) => item == '084')"
+              name="5"
+              v-if="status == '7' && powers.some((item) => item == '084')"
             >
-              <exam-form
+              <exam-formss
                 :statusList="[]"
                 :newTime="newTime"
                 :disabled="false"
+                :remarkTxt="sitem.remark"
+                remarkTitle="财务主管"
                 :isMust="false"
-                @searchChange="examForm($event, 8, 'BOSS')"
+                @searchChange="examForm($event, 7, 'BOSS')"
+              />
+            </el-collapse-item>
+
+            <el-collapse-item
+              title="驳回意见详情"
+              name="6"
+              v-if="
+                status == '3' ||
+                status == '5' ||
+                status == '8' ||
+                status == '11'
+              "
+            >
+              <exam-formss
+                :statusList="[]"
+                :newTime="newTime"
+                flag="0"
+                :remarkTxt="sitem.remark"
+                remarkTitle="驳回详情"
               />
             </el-collapse-item>
           </el-collapse>
@@ -224,6 +247,7 @@
   </div>
 </template>
    <script>
+import examFormss from "./exam-form/main.vue";
 import asyncRequest from "@/apis/service/sellOut/bargainList";
 import resToken from "@/mixins/resToken";
 import { mapGetters } from "vuex";
@@ -246,6 +270,9 @@ import {
   options12,
 } from "./columns";
 export default {
+  components: {
+    examFormss,
+  },
   name: "bargainListDetail",
   mixins: [resToken],
   computed: {
@@ -267,8 +294,8 @@ export default {
     return {
       statusList: [],
       size: "small",
-      costArr:costArr,
-      bargainingArr:bargainingArr,
+      costArr: costArr,
+      bargainingArr: bargainingArr,
       editColumns: editColumns,
       options1: options1,
       options2: options2,
@@ -291,15 +318,30 @@ export default {
       status: "",
       sitem: null,
       options: [
-        { id: "1", label: "待主管审批", type: "" },
+        // 0待业务主管审核
+        { id: "0", label: "待业务主管审核", type: "" },
+        { id: "1", label: "业务主管审核通过", type: "" },
+        //  2 业务税率未通过直接财务专员审批
+        // { id: "2", label: "业务税率未通过", type: "" },
         { id: "2", label: "待财务专员审批", type: "" },
-        { id: "3", label: "待财务主管审批", type: "" },
-        { id: "4", label: "审批通过", type: "" },
-        { id: "5", label: "主管驳回", type: "" },
-        { id: "6", label: "财务主管驳回", type: "" },
-        { id: "7", label: "已取消议价", type: "" },
-        { id: "8", label: "待BOSS审批", type: "" },
-        { id: "9", label: "BOSS驳回", type: "" },
+        { id: "3", label: "业务驳回", type: "" },
+        // { id: "4", label: "专员通过", type: "" },
+        // 4 专员通过后直接财务主管审核
+        { id: "4", label: "待财务主管审核", type: "" },
+        { id: "5", label: "专员驳回", type: "" },
+        { id: "6", label: "财务通过", type: "" },
+        // { id: "7", label: "财务税率未通过", type: "" },
+        // 7 财务税率未通过直接BOSS审批
+        { id: "7", label: "待BOSS审批", type: "" },
+        { id: "8", label: "财务驳回", type: "" },
+        { id: "9", label: "boss通过", type: "" },
+        { id: "10", label: "boss税率越线通过", type: "" },
+        { id: "11", label: "boss驳回", type: "" },
+
+        // 0待审核 1业务主管审核通过
+        //  2 业务税率未通过 3 业务驳回 4 专员通过
+        //  5 专员驳回 6 财务通过 7 财务税率未通过
+        //  8财务驳回 9 boss通过 10 boss 税率越线通过 11 boss驳回
       ],
     };
   },
@@ -328,10 +370,12 @@ export default {
       const { code, message, data } = await asyncRequest.detail({
         bargainNo: this.queryId,
       });
+
       this.loading = false;
       if (code === 0) {
         this.sitem = JSON.parse(JSON.stringify(data));
         const { status, can } = this.sitem;
+
         // if (can && can.length > 0) {
         //   let cat_id = [];
         //   can.forEach((e) => {
@@ -343,6 +387,11 @@ export default {
         // }
 
         this.status = status;
+        console.log("当前对应状态", this.status);
+        console.log("当前数据",this.sitem)
+        console.log(JSON.parse(JSON.stringify(this.sitem.exam_info)))
+        console.log(JSON.parse(this.sitem.exam_info))
+        
         this.getNewTime();
       } else if (code >= 100 && code <= 104) {
         await this.logout();
@@ -361,46 +410,92 @@ export default {
       if (!this.loading) {
         let model = {
           bargainNo: this.queryId,
-          status: "",
-          remark: e.state === "1" ? "" : e.remark,
+          status: e.state,
+          // remark: e.state === "1" ? "" : e.remark,
+          remark: e.remark,
         };
-        if (type === 1) {
-          model.status = e.state === "1" ? "2" : "5";
-        } else if (type === 2) {
-          model.status = "3";
-        }else if (type === 3) {
-          model.status = "8";
-        }else if (type === 8) {
-          model.status = e.state === "1" ? "4" : "9";
-        }   else {
-          model.status = e.state === "1" ? "4" : "6";
-        }
+
+        // if (type === 1) {
+        //   model.status = e.state === "1" ? "2" : "5";
+        // } else if (type === 2) {
+        //   model.status = "3";
+        // }else if (type === 3) {
+        //   model.status = "8";
+        // }else if (type === 8) {
+        //   model.status = e.state === "1" ? "4" : "9";
+        // }   else {
+        //   model.status = e.state === "1" ? "4" : "6";
+        // }
+
+        return;
         await this.setstatus(`提交${title}审核`, model);
       }
     },
     async setstatus(detail, model) {
-      await this.$confirm(`确定要${detail}？`, {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(async () => {
-          let res = await asyncRequest.status(model);
-          if (res && res.code === 0) {
-            this.$notify.success({
-              title: "提交成功！",
-              message: "",
-            });
-            await this.initForm();
-          } else if (res && res.code >= 100 && res.code <= 104) {
-            await this.logout();
-          } else {
-            this.$message.warning(res.message);
+      //if(this.sitem.status == BOSS 并且 最低售价越过红线)
+      //需要补充逻辑字段
+      if (this.sitem.status == 7) {
+        await this.$confirm(
+          `当前最低售价为${this.sitem.lower_price}确定要继续吗？`,
+          {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
           }
+        )
+          .then(async () => {
+            await this.$confirm(`确定要${detail}？`, {
+              confirmButtonText: "确定",
+              cancelButtonText: "取消",
+              type: "warning",
+            })
+              .then(async () => {
+                let res = await asyncRequest.status(model);
+                console.log("res", res);
+                if (res && res.code === 0) {
+                  this.$notify.success({
+                    title: "提交成功！",
+                    message: "",
+                  });
+                  await this.initForm();
+                } else if (res && res.code >= 100 && res.code <= 104) {
+                  await this.logout();
+                } else {
+                  this.$message.warning(res.message);
+                }
+              })
+              .catch(() => {
+                console.log("取消");
+              });
+          })
+          .catch(() => {
+            console.log("取消");
+          });
+      } else {
+        await this.$confirm(`确定要${detail}？`, {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
         })
-        .catch(() => {
-          console.log("取消");
-        });
+          .then(async () => {
+            let res = await asyncRequest.status(model);
+            console.log("res", res);
+            if (res && res.code === 0) {
+              this.$notify.success({
+                title: "提交成功！",
+                message: "",
+              });
+              await this.initForm();
+            } else if (res && res.code >= 100 && res.code <= 104) {
+              await this.logout();
+            } else {
+              this.$message.warning(res.message);
+            }
+          })
+          .catch(() => {
+            console.log("取消");
+          });
+      }
     },
   },
 };

src/views/sellOut/bargainList/exam-form/index.js

@@ -0,0 +1,2 @@
+import Main from './main.vue'
+export default Main

src/views/sellOut/bargainList/exam-form/main.vue

@@ -0,0 +1,227 @@
+<template>
+  <el-form
+    v-loading="loading"
+    ref="ruleForm"
+    :model="ruleForm"
+    status-icon
+    :rules="rulesThis"
+    :label-width="labelWidth || '100px'"
+    class="demo-ruleForm"
+    :size="size || 'medium'"
+  >
+    <div class="exa" v-if="remarkTitle && flag == 0" style="width:50%">
+          {{remarkTitle}}：<el-input type="textarea" disabled v-model="remarkTxt"></el-input>
+          
+    </div>
+    <el-row v-if="flag != 0">
+      <el-col :span="12"
+        ><el-form-item label="审核状态" prop="state">
+          <el-radio-group
+            v-model="ruleForm.state"
+            placeholder="请选择审核状态"
+            style="width: 100%"
+            :size="size || 'medium'"
+            @change="stateChange"
+          >
+            <el-radio
+              v-for="item in stateList"
+              :key="item.value"
+              :label="item.value"
+              >{{ item.label }}</el-radio
+            >
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item
+          label="驳回节点"
+          v-if="ruleForm.state === '0' && isMust"
+          prop="rebut"
+        >
+          <el-select
+            v-model="ruleForm.rebut"
+            placeholder="请选择驳回节点"
+            style="width: 100%"
+            :disabled="disabled"
+          >
+            <el-option
+              v-for="item in statusList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+              :disabled="item.disabled"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+
+
+
+
+        
+        <div class="exa" v-if="remarkTitle">
+          {{remarkTitle}}审核意见：
+          <el-input type="textarea" disabled v-model="remarkTxt">
+
+          </el-input>
+        </div>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item
+          label="审核备注"
+          
+          prop="remark"
+        >
+          <el-input
+            type="textarea"
+            placeholder="请输入审核备注"
+            v-model="ruleForm.remark"
+            :disabled="disabled"
+            maxlength="250"
+            :autosize="{ minRows: 3, maxRows: 3 }"
+            show-word-limit
+          />
+        </el-form-item>
+        <el-form-item class="fr">
+          
+          <el-button
+            v-if="!isDetail"
+            :size="'mini'"
+            type="primary"
+            @click="submitForm"
+            >保 存
+          </el-button>
+        </el-form-item>
+      </el-col>
+    </el-row>
+  </el-form>
+</template>
+
+<script>
+export default {
+  name: "exam-form",
+  props: ["size", "statusList", "disabled", "isMust", "labelWidth","remarkTxt","remarkTitle","flag"],
+  /**
+   * 属性集合
+   * @param {String}        size             : 组件大小             非必填
+   * @param {Array}         statusList       : 驳回至备选项          必填
+   * @param {Boolean}       disabled         : 是否禁用              必填
+   * @param {Boolean}       isMust           : 是否需要展示驳回节点   必填
+   *
+   *
+   */
+  /**
+   * 事件集合
+   * @searchChange             : 选中值变化调用   抛出选中数据
+   */
+  data() {
+    return {
+      loading: false,
+      stateList: [
+        {
+          value: "1",
+          label: "通过",
+        },
+        {
+          value: "0",
+          label: "驳回",
+        },
+      ],
+      showModelThis: this.showModel,
+      ruleForm: {
+        state: "1", // 通过or驳回
+        rebut: "", //驳回至
+        remark: "",
+      },
+      rulesThis: this.rules,
+      rules: {
+        state: [
+          {
+            required: true,
+            message: "请选择审核状态",
+            trigger: "change",
+          },
+        ],
+        rebut: [
+          {
+            required: true,
+            message: "请选择驳回节点",
+            trigger: "change",
+          },
+        ],
+        remark: [
+          { required: true, message: "请输入审核备注", trigger: "blur" },
+          {
+            min: 1,
+            max: 250,
+            message: "长度在 1 到 250 个字符",
+            trigger: "blur",
+          },
+        ],
+      },
+    };
+  },
+  watch: {
+    isDetail: function (val, old) {
+      if (this.isDetail !== val) {
+        this.options = [];
+        this.selectLoading = false;
+      }
+    },
+  },
+  mounted() {
+    this.initForm();
+  },
+  methods: {
+    async initForm() {
+      this.loading = true;
+      this.rulesThis = this.rules;
+      await this.resetForm();
+      this.stateChange();
+      this.loading = false;
+    },
+    stateChange() {
+      if (this.ruleForm.state === "1") {
+        this.rulesThis.rebut[0].required = false;
+        this.rulesThis.remark[0].required = false;
+      } else {
+        this.rulesThis.rebut[0].required = true;
+        this.rulesThis.remark[0].required = true;
+      }
+    },
+    async resetForm() {
+      // 重置
+      await this.$nextTick(() => {
+        if (this.$refs.ruleForm) {
+          this.$refs.ruleForm.resetFields();
+          this.$refs.ruleForm.clearValidate();
+          this.ruleForm = {
+            state: "1", // 通过or驳回
+            rebut: "", //驳回至
+            remark: "",
+          };
+        }
+      });
+    },
+    async submitForm() {
+      await this.$refs.ruleForm.validate(async (valid) => {
+        if (valid) {
+          this.$emit("searchChange", this.ruleForm);
+          //回显清空
+          this.ruleForm.remark = ""
+        } else {
+          console.log("error submit!!");
+          return false;
+        }
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+
+  .exa{
+    margin: 20px 0 0 30px;
+    font-size: 14px;
+    font-weight: bold;
+  }
+</style>

src/views/sellOut/bargainList/index.vue

@@ -211,16 +211,24 @@ export default {
       s_input: "",
       customerCode: [], //客户公司code
       options: [
-        { id: "1", label: "待业务主管审批" },
-        { id: "2", label: "待财务专员审批" },
-        { id: "3", label: "待财务主管审批" },
-        { id: "4", label: "审批通过" },
-        { id: "5", label: "业务主管驳回" },
-        { id: "6", label: "财务主管驳回" },
-        { id: "7", label: "已取消议价" },
-        { id: "8", label: "待BOSS审批" },
-        { id: "9", label: "BOSS驳回" },
+        { id: "0", label: "待业务主管审核" },
+        { id: "1", label: "业务主管审核通过" },
+        { id: "2", label: "业务税率未通过" },
+        { id: "3", label: "业务驳回" },
+        { id: "4", label: "财务专员通过" },
+        { id: "5", label: "财务专员驳回" },
+        { id: "6", label: "财务主管通过" },
+        { id: "7", label: "财务主管税率未通过" },
+        { id: "8", label: "财务主管驳回" },
+        { id: "9", label: "boss通过" },
+        { id: "10", label: "boss税率越线通过" },
+        { id: "11", label: "boss驳回" },
+        
       ],
+      // 0待审核 1业务主管审核通过
+        //  2 业务税率未通过 3 业务驳回 4 专员通过 
+        //  5 专员驳回 6 财务通过 7 财务税率未通过 
+        //  8财务驳回 9 boss通过 10 boss 税率越线通过 11 boss驳回
 
       sitem: null,