1

src/views/sellOut/bargainList/columns.js

@@ -58,8 +58,27 @@ const options12 = [
   { id: "0", name: "一地" },
   { id: "1", name: "多地" },
 ]
+const statusList = [
+  { id: "0", label: "待业务主管审核", type: "warning" },
+  { id: "1", label: "业务主管通过", type: "success" },
+  { id: "2", label: "待财务专员审批", type: "warning" },
+  { id: "3", label: "业务主管驳回", type: "danger" },
+  { id: "4", label: "待财务主管审核", type: "warning" },
+  // { id: "5", label: "专员驳回", type: "" },
+  { id: "6", label: "财务主管通过", type: "success" },
+  { id: "7", label: "待BOSS审批", type: "warning" },
+  { id: "8", label: "财务主管驳回", type: "danger" },
+  { id: "9", label: "boss通过", type: "success" },
+  { id: "10", label: "boss越线通过", type: "" },
+  { id: "11", label: "boss驳回", type: "danger" },
+]
 const editColumns = [
-  
+  {
+    prop: "bargainNo",
+    label: "议价单编号",
+    span: 6
+  },
+
   {
     prop: "bidsNo",
     label: "反馈商品编号",
@@ -76,31 +95,14 @@ const editColumns = [
     _slot_: "status",
     span: 6
   },
-  {
-    prop: "creater",
-    label: "创建人",
-    span: 6
-  },
 
 
-  {
-    prop: "brand_name",
-    label: "品牌",
-    span: 6
-  },
-
   {
     prop: "good_name",
     label: "商品名称",
     _slot_: "good_name",
     span: 12
   },
-  {
-    prop: "can",
-    label: "商品分类",
-    _slot_: "can",
-    span: 12
-  },
   {
     prop: "specinfo",
     label: "商品规格",
@@ -108,49 +110,22 @@ const editColumns = [
     span: 12
   },
   {
-    prop: "origin_addr",
-    label: "产地",
-    span: 12
-  },
-
-  {
-    prop: "expire_day",
-    label: "咨询有效期",
-    append: '天',
-    span: 6
-  },
-  {
-    prop: "delivery_day",
-    label: "物流时间",
-    append: '天',
-    span: 6
-  },
-  {
-    prop: "work_day",
-    label: "生产工期",
-    append: '天',
-    span: 6
-  },
-  {
-    prop: "tax",
-    label: "税点",
-    append: '%',
+    prop: "can",
+    label: "商品分类",
+    _slot_: "can",
     span: 6
   },
   {
-    prop: "is_addrs",
-    label: "是否多地",
-    _slot_: "is_addrs",
+    prop: "brand_name",
+    label: "品牌",
     span: 6
   },
+
   {
-    prop: "is_custom",
-    label: "是否定制",
-    _slot_: "is_custom",
+    prop: "origin_addr",
+    label: "产地",
     span: 6
   },
-
-
   {
     prop: "weight",
     label: "商品总重量",
@@ -176,20 +151,71 @@ const editColumns = [
     _slot_: "send_way",
     span: 6
   },
-  
+  {
+    prop: "addtime",
+    label: "添加时间",
+    span: 6
+  },
+  {
+    prop: "tax",
+    label: "税点",
+    append: '%',
+    span: 4
+  },
+  {
+    prop: "expire_day",
+    label: "咨询有效期",
+    append: '天',
+    span: 4
+  },
+  {
+    prop: "delivery_day",
+    label: "物流时间",
+    append: '天',
+    span: 4
+  },
+  {
+    prop: "work_day",
+    label: "生产工期",
+    append: '天',
+    span: 4
+  },
+
+  {
+    prop: "is_addrs",
+    label: "是否多地",
+    _slot_: "is_addrs",
+    span: 4
+  },
+  {
+    prop: "is_custom",
+    label: "是否定制",
+    _slot_: "is_custom",
+    span: 4
+  },
+
+
+
 
 
   {
     prop: "good_num",
     label: "购买数量",
     _slot_: "good_num",
-    span: 6
+    span: 4
   },
+  {
+    prop: "creater",
+    label: "创建人",
+    span: 4
+  },
+
+
   {
     prop: "metal_id",
     label: "贵金属信息",
     _slot_: "metal_id",
-    span: 18
+    span: 16
   },
 
 
@@ -197,13 +223,8 @@ const editColumns = [
 
 
 
- 
-  {
-    prop: "addtime",
-    label: "创建时间",
-    span: 6
-  },
-  
+
+
   {
     prop: "remark",
     label: "采购备注",
@@ -215,8 +236,42 @@ const editColumns = [
     label: "工艺说明",
     span: 24
   },
-  
+  {
+    prop: "result_info",
+    label: "议价原因",
+    span: 24
+  },
+  {
+    prop: "bargain_remark",
+    label: "议价备注",
+    span: 24
+  },
+  {
+    prop: "sale_price",
+    label: "议价前售价",
+    append: '元',
+    span: 6
+  },
+  {
+    prop: "after_price",
+    label: "议价后售价",
+    append: '元',
+    span: 6
+  },
+
+  {
+    prop: "cost_before_price",
+    label: "议价前工艺费",
+    append: '元',
+    span: 6
+  },
 
+  {
+    prop: "cost_after_price",
+    label: "议价后工艺费",
+    append: '元',
+    span: 6
+  },
 ]
 
 const costArr = [
@@ -272,42 +327,15 @@ const costArr = [
 ]
 
 const bargainingArr = [
-  {
-    prop: "bargainNo",
-    label: "议价单编号",
-    span: 6
-  },
-  {
-    prop: "sale_price",
-    label: "议价前售价",
-    append: '元',
-    span: 6
-  },
 
-  {
-    prop: "cost_before_price",
-    label: "议价前工艺费",
-    append: '元',
-    span: 6
-  },
+
   {
     prop: "before_rate",
     label: "议价前毛利率",
     append: '%',
     span: 6
   },
-  {
-    prop: "after_price",
-    label: "议价后单价",
-    append: '元',
-    span: 6
-  },
-  {
-    prop: "cost_after_price",
-    label: "议价后工艺费",
-    append: '元',
-    span: 6
-  },
+
 
   {
     prop: "after_rate",
@@ -315,16 +343,14 @@ const bargainingArr = [
     append: '%',
     span: 6
   },
+
   {
-    prop: "result_info",
-    label: "议价原因",
+    prop: "total_fee",
+    label: "采购成本合计",
+    append: '元',
     span: 6
   },
-  {
-    prop: "bargain_remark",
-    label: "议价备注",
-    span: 24
-  },
+
 ]
 
 const listCol = [
@@ -384,11 +410,7 @@ const listCol = [
     "width": "75"
   },
 
-  {
-    prop: "addtime",
-    label: "添加时间",
-    width: 142,
-  },
+
   {
     prop: "",
     label: "操作",
@@ -416,5 +438,6 @@ export {
   options12,
   editColumns,
   bargainingArr,
-  costArr
+  costArr,
+  statusList
 }

src/views/sellOut/bargainList/detail.vue

@@ -4,22 +4,26 @@
       class="bargainListDetail-main"
       v-if="powers && powers.length > 0 && powers.some((item) => item == '007')"
     >
-      <el-tabs v-model="projectTabs">
+      <el-tabs v-model="projectTabs" v-loading="loading">
         <el-tab-pane label="议价单详情" name="1">
           <el-collapse v-model="activeNames" style="margin: -18px 0 0 0">
             <el-collapse-item :title="'议价详情'" name="1">
               <show-data-table
                 style="padding: -5px 0 10px 0"
                 :newTime="newTime"
-                v-if="newTime !== '' && queryType === 'view'"
+                v-if="newTime !== ''"
                 :sitem="sitem"
                 :columns="editColumns"
               >
                 <template slot="status">
                   <el-tag
                     :size="tablebtnSize"
+                    :type="
+                      (statusList.find((item) => item.id == sitem.status) || {})
+                        .type || ''
+                    "
                     v-text="
-                      (options.find((item) => item.id == sitem.status) || {})
+                      (statusList.find((item) => item.id == sitem.status) || {})
                         .label || '--'
                     "
                   ></el-tag>
@@ -136,7 +140,7 @@
               <show-data-table
                 style="padding: -5px 0 10px 0"
                 :newTime="newTime"
-                v-if="newTime !== '' && queryType === 'view'"
+                v-if="newTime !== ''"
                 :sitem="sitem"
                 :columns="costArr"
               >
@@ -144,89 +148,54 @@
               <show-data-table
                 style="padding: -5px 0 10px 0"
                 :newTime="newTime"
-                v-if="newTime !== '' && queryType === 'view'"
+                v-if="newTime !== ''"
                 :sitem="sitem"
                 :columns="bargainingArr"
               >
               </show-data-table>
             </el-collapse-item>
-            <el-collapse-item
-              title="业务部门审批"
-              name="2"
-              v-if="status == '0' && powers.some((item) => item == '043')"
-            >
+            <el-collapse-item title="业务部门审批" name="2">
               <exam-formss
-                :statusList="[]"
                 :newTime="newTime"
-                :disabled="false"
-                :isMust="false"
-                
-                @searchChange="examForm($event, 1, '业务部门')"
+                v-if="newTime !== ''"
+                :disabled="
+                  !(status == '0' && powers.some((item) => item == '043'))
+                "
+                :sitem="orderItem"
+                @searchChange="examFormSubmit($event, '业务部门')"
               />
             </el-collapse-item>
-            <el-collapse-item
-              title="财务专员审批"
-              name="3"
-              v-if="status == '2' && powers.some((item) => item == '058')"
-            >
+            <el-collapse-item title="财务专员审批" name="3">
               <exam-formss
-                :statusList="[]"
                 :newTime="newTime"
-                :remarkTxt="sitem.remark"
-                remarkTitle="业务主管"
-                :disabled="false"
-                :isMust="false"
-                @searchChange="examForm($event, 2, '财务专员')"
+                v-if="newTime !== ''"
+                :disabled="
+                  !(status == '2' && powers.some((item) => item == '058'))
+                "
+                :sitem="moneyDirItem"
+                @searchChange="examFormSubmit($event, '财务专员')"
               />
             </el-collapse-item>
-            <el-collapse-item
-              title="财务主管审批"
-              name="4"
-              v-if="status == '4' && powers.some((item) => item == '059')"
-            >
+            <el-collapse-item title="财务主管审批" name="4">
               <exam-formss
-                :statusList="[]"
                 :newTime="newTime"
-                :remarkTxt="sitem.remark"
-                remarkTitle="财务专员"
-                :disabled="false"
-                :isMust="false"
-                @searchChange="examForm($event, 3, '财务主管')"
+                v-if="newTime !== ''"
+                :disabled="
+                  !(status == '4' && powers.some((item) => item == '059'))
+                "
+                :sitem="moneyItem"
+                @searchChange="examFormSubmit($event, '财务主管')"
               />
             </el-collapse-item>
-
-            <el-collapse-item
-              title="BOSS审批"
-              name="5"
-              v-if="status == '7' && powers.some((item) => item == '084')"
-            >
-              <exam-formss
-                :statusList="[]"
-                :newTime="newTime"
-                :disabled="false"
-                :remarkTxt="sitem.remark"
-                remarkTitle="财务主管"
-                :isMust="false"
-                @searchChange="examForm($event, 7, 'BOSS')"
-              />
-            </el-collapse-item>
-
-            <el-collapse-item
-              title="驳回意见详情"
-              name="6"
-              v-if="
-                status == '3' ||
-                status == '5' ||
-                status == '8' ||
-                status == '11'
-              "
-            >
+            <el-collapse-item title="BOSS审批" name="5">
               <exam-formss
-                :statusList="[]"
                 :newTime="newTime"
-                flag="0"
-                :remarkTxt="sitem.remark"
-                remarkTitle="驳回详情"
+                v-if="newTime !== ''"
+                :disabled="
+                  !(status == '7' && powers.some((item) => item == '084'))
+                "
+                :sitem="BossItem"
+                @searchChange="examFormSubmit($event, 'BOSS')"
               />
             </el-collapse-item>
           </el-collapse>
@@ -247,7 +216,7 @@
   </div>
 </template>
    <script>
-import examFormss from "./exam-form/main.vue";
+import examFormss from "./exam-form.vue";
 import asyncRequest from "@/apis/service/sellOut/bargainList";
 import resToken from "@/mixins/resToken";
 import { mapGetters } from "vuex";
@@ -268,6 +237,7 @@ import {
   options10,
   options11,
   options12,
+  statusList
 } from "./columns";
 export default {
   components: {
@@ -292,23 +262,23 @@ export default {
 
   data() {
     return {
-      statusList: [],
       size: "small",
-      costArr: costArr,
-      bargainingArr: bargainingArr,
-      editColumns: editColumns,
-      options1: options1,
-      options2: options2,
-      options3: options3,
-      options4: options4,
-      options5: options5,
-      options6: options6,
-      options7: options7,
-      options8: options8,
-      options9: options9,
-      options10: options10,
-      options11: options11,
-      options12: options12,
+      costArr,
+      bargainingArr,
+      editColumns,
+      options1,
+      options2,
+      options3,
+      options4,
+      options5,
+      options6,
+      options7,
+      options8,
+      options9,
+      options10,
+      options11,
+      options12,
+      statusList,
       projectTabs: "1",
       activeNames: ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"],
       newTime: "",
@@ -317,32 +287,11 @@ export default {
       queryId: "",
       status: "",
       sitem: null,
-      options: [
-        // 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: "" },
-        // 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驳回
-      ],
+      orderItem: {},
+      moneyDirItem: {},
+      moneyItem: {},
+      BossItem: {},
     };
   },
   mounted() {
@@ -374,24 +323,35 @@ export default {
       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) => {
-        //     cat_id.push(e.id);
-        //   });
-        //   this.sitem.cat_id = cat_id;
-        // } else {
-        //   this.sitem.cat_id = [];
-        // }
+        const { status, exam_info } = this.sitem;
+        this.orderItem = {};
+        this.moneyDirItem = {};
+        this.moneyItem = {};
+        this.BossItem = {};
+        if (exam_info && exam_info.length > 0) {
+          exam_info.forEach((e) => {
+            console.log(e.status);
+            switch (e.status + "") {
+              case "0":
+                this.orderItem = JSON.parse(JSON.stringify(e));
+                break;
+              case "2":
+                this.moneyDirItem = JSON.parse(JSON.stringify(e));
+                break;
+              case "4":
+                this.moneyItem = JSON.parse(JSON.stringify(e));
+                break;
+              case "7":
+                this.BossItem = JSON.parse(JSON.stringify(e));
+                break;
+              default:
+                this.orderItem = JSON.parse(JSON.stringify(e));
+            }
+          });
+        }
 
         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();
@@ -405,96 +365,74 @@ export default {
 
     // 点击业务审核的保存按钮
 
-    async examForm(e, type, title) {
-      console.log(e, type, title);
+    async examFormSubmit(e, title) {
       if (!this.loading) {
         let model = {
           bargainNo: this.queryId,
           status: e.state,
-          // remark: e.state === "1" ? "" : e.remark,
           remark: e.remark,
         };
+        // await this.setBossStatus(model, title);
 
-        // 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);
+        // await this.setstatus(`提交${title}审核`, model);
+        await this.statusSubmit(model, title);
       }
     },
-    async setstatus(detail, model) {
-      //if(this.sitem.status == BOSS 并且 最低售价越过红线)
-      //需要补充逻辑字段
-      if (this.sitem.status == 7) {
-        await this.$confirm(
-          `当前最低售价为${this.sitem.lower_price}确定要继续吗？`,
-          {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning",
+    async setstatus(title, model) {
+      await this.$confirm(`确定要${title}？`, {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(async () => {
+          const { after_price, lower_price } = this.sitem;
+          if (this.status === "7" && after_price * 1 < lower_price * 1) {
+            this.loading = false;
+            await this.setBossStatus(model, title);
+          } else {
+            await this.statusSubmit(model, title);
           }
-        )
-          .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}？`, {
+        })
+        .catch(() => {
+          this.loading = false;
+          console.log("取消");
+        });
+    },
+    async setBossStatus(title, model) {
+      // const
+      await this.$confirm(
+        `当前商品同意议价后，售价已低于系统最低售价${this.sitem.lower_price}元！`,
+        `最终售价已低于系统最低售价！是否继续？`,
+
+        {
           confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
+          cancelButtonText: "取消2",
+          type: "error",
+        }
+      )
+        .then(async () => {
+          this.loading = true;
+          await this.statusSubmit(model, title);
         })
-          .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(() => {
+          this.loading = false;
+          console.log("取消1");
+        });
+    },
+    async statusSubmit(model, title) {
+      const { code, data, message } = await asyncRequest.status(model);
+      this.loading = false;
+      // console.log("res", data);
+      if (code === 0) {
+        this.$notify.success({
+          title: title + "成功！",
+          message: "",
+        });
+        // await this.initForm();
+      } else if (code >= 100 && code <= 104) {
+        await this.logout();
+      } else {
+        this.$message.warning(message);
       }
     },
   },

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

@@ -9,18 +9,14 @@
     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-row>
       <el-col :span="12"
         ><el-form-item label="审核状态" prop="state">
           <el-radio-group
             v-model="ruleForm.state"
-            placeholder="请选择审核状态"
+            placeholder="审核状态"
             style="width: 100%"
-            :size="size || 'medium'"
+            :disabled="disabled"
             @change="stateChange"
           >
             <el-radio
@@ -31,65 +27,29 @@
             >
           </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-button
+          v-if="!disabled"
+          :size="'mini'"
+          type="primary"
+          class="fr"
+          @click="submitForm"
+          >保 存
+        </el-button>
+      </el-col>
+      <el-col :span="24">
+        <el-form-item label="审核备注" prop="remark">
           <el-input
             type="textarea"
-            placeholder="请输入审核备注"
+            placeholder="审核备注"
             v-model="ruleForm.remark"
             :disabled="disabled"
             maxlength="250"
-            :autosize="{ minRows: 3, maxRows: 3 }"
+            :autosize="{ minRows: 2, maxRows: 2 }"
             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>
@@ -98,7 +58,7 @@
 <script>
 export default {
   name: "exam-form",
-  props: ["size", "statusList", "disabled", "isMust", "labelWidth","remarkTxt","remarkTitle","flag"],
+  props: ["size", "disabled", "labelWidth", "sitem"],
   /**
    * 属性集合
    * @param {String}        size             : 组件大小             非必填
@@ -140,31 +100,16 @@ export default {
             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;
-      }
+    newTime: function () {
+      this.initForm();
     },
   },
   mounted() {
@@ -179,13 +124,7 @@ export default {
       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;
-      }
+      this.rulesThis.remark[0].required = this.ruleForm.state !== "1";
     },
     async resetForm() {
       // 重置
@@ -193,10 +132,11 @@ export default {
         if (this.$refs.ruleForm) {
           this.$refs.ruleForm.resetFields();
           this.$refs.ruleForm.clearValidate();
+          console.log(this.sitem);
+          const { state, remark } = this.sitem;
           this.ruleForm = {
-            state: "1", // 通过or驳回
-            rebut: "", //驳回至
-            remark: "",
+            state: state || "1", // 通过or驳回
+            remark: remark || "",
           };
         }
       });
@@ -205,8 +145,6 @@ export default {
       await this.$refs.ruleForm.validate(async (valid) => {
         if (valid) {
           this.$emit("searchChange", this.ruleForm);
-          //回显清空
-          this.ruleForm.remark = ""
         } else {
           console.log("error submit!!");
           return false;
@@ -218,10 +156,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-
-  .exa{
-    margin: 20px 0 0 30px;
-    font-size: 14px;
-    font-weight: bold;
-  }
+.exa {
+  margin: 20px 0 0 30px;
+  font-size: 14px;
+  font-weight: bold;
+}
 </style>

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

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

src/views/sellOut/bargainList/index.vue

@@ -133,9 +133,12 @@
         <template #status="{ scope }">
           <el-tag
             :size="tablebtnSize"
-            :type="scope.row.status == '0' ? 'warning' : ''"
+            :type="
+              (statusList.find((item) => item.id == sitem.status) || {}).type ||
+              ''
+            "
             v-text="
-              (options.find((item) => item.id == scope.row.status) || {})
+              (statusList.find((item) => item.id == scope.row.status) || {})
                 .label || '--'
             "
           ></el-tag>
@@ -185,7 +188,7 @@
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
 import asyncRequest from "@/apis/service/sellOut/bargainList";
-import { listCol } from "./columns";
+import { listCol, statusList } from "./columns";
 import { mapGetters } from "vuex";
 
 export default {
@@ -210,26 +213,7 @@ export default {
       select: "1",
       s_input: "",
       customerCode: [], //客户公司code
-      options: [
-        { 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驳回
-
+      statusList,
       sitem: null,
 
       loading: true,

src/views/sellOut/zixunOrder/components/addEditBargain.vue

@@ -24,7 +24,17 @@
         class="demo-ruleForm"
       >
         <el-row>
-          <el-col :span="3">
+          <el-col :span="24">
+            <el-form-item label="商品名称">
+              <el-input
+                v-if="show_sitem"
+                v-model="show_sitem.good_name"
+                maxlength="100"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
             <el-form-item label="图片" style="margin: 0" label-width="44px">
               <img
                 class="hover"
@@ -46,32 +56,6 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="17">
-            <el-form-item label="商品名称">
-              <el-input
-                v-if="show_sitem"
-                v-model="show_sitem.good_name"
-                maxlength="100"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item
-              label="议价原因"
-              prop="result_info_id"
-              label-width="88px"
-            >
-              <abnormal-cause
-                :value="ruleForm.result_info_id"
-                :placeholder="'议价原因'"
-                :type="'7'"
-                :disabled="false"
-                :size="'mini'"
-                @searchChange="select_change"
-              />
-            </el-form-item>
-          </el-col>
 
           <el-col :span="7">
             <el-form-item label="当前售价">
@@ -94,8 +78,12 @@
                 :name="'ruleForm.bargain_price'"
                 :placeholder="'期望售价'"
                 :min="0"
-                :disabled="sitem.is_gold_price == 0 ? false : true"
-                :max="100000000000"
+                :disabled="sitem.is_gold_price == 1 && sitem.can[0].id == 6"
+                :max="
+                  show_sitem && show_sitem.sale_price
+                    ? show_sitem.sale_price
+                    : '0'
+                "
                 :position="'right'"
                 :precision="2"
                 :size="'mini'"
@@ -105,8 +93,23 @@
               />
             </el-form-item>
           </el-col>
-          <!-- 需修改字段 -->
-          <el-col :span="12">
+          <el-col :span="8">
+            <el-form-item
+              label="议价原因"
+              prop="result_info_id"
+              label-width="88px"
+            >
+              <abnormal-cause
+                :value="ruleForm.result_info_id"
+                :placeholder="'议价原因'"
+                :type="'7'"
+                :disabled="false"
+                :size="'mini'"
+                @searchChange="select_change"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="7">
             <el-form-item label="当前工艺费" label-width="108px">
               <el-input
                 v-if="show_sitem"
@@ -116,7 +119,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="9">
             <el-form-item
               label="期望工艺费"
               prop="cost_price"
@@ -127,12 +130,12 @@
                 :name="'ruleForm.cost_price'"
                 :placeholder="'期望工艺费'"
                 :min="0"
-                :disabled="
-                  sitem.is_gold_price == 1 && sitem.can[0].id == 6
-                    ? false
-                    : true
+                :disabled="!(sitem.is_gold_price == 1 && sitem.can[0].id == 6)"
+                :max="
+                  show_sitem && show_sitem.sale_cost_fee
+                    ? show_sitem.sale_cost_fee
+                    : '0'
                 "
-                :max="100000000000"
                 :position="'right'"
                 :precision="2"
                 :size="'mini'"
@@ -260,14 +263,7 @@ export default {
       }
     },
   },
-  mounted() {
-    console.log("11111111111111111", this.sitem.is_gold_price);
-  },
   methods: {
-    itemidChange(e) {
-      this.ruleForm.itemid = e;
-      this.$refs.ruleForm.validateField("itemid");
-    },
     async initForm() {
       this.loading = true;
       this.rulesThis = this.rules;
@@ -284,7 +280,7 @@ export default {
       // 重置
       await this.$nextTick(() => {
         this.show_sitem = JSON.parse(JSON.stringify(this.sitem));
-        const { sale_price, specinfo } = this.sitem;
+        const { sale_price, specinfo, sale_cost_fee, bidNo } = this.sitem;
         if (specinfo && specinfo.length > 0) {
           specinfo.forEach((a, ai) => {
             this.show_sitem.good_name += `${ai === 0 ? "_" : "-"}${
@@ -296,10 +292,11 @@ export default {
           this.$refs.ruleForm.resetFields();
           this.$refs.ruleForm.clearValidate();
           this.ruleForm = {
-            bargain_price: "0",
-            result_info_id: "",
+            bargain_price: sale_price || "0",
+            bidNo: bidNo || "",
             bargain_remark: "",
-            cost_price: "0",
+            cost_price: sale_cost_fee || "0",
+            result_info_id: "",
             result_info_id_name: "",
           };
         }
@@ -314,98 +311,43 @@ export default {
     async submitForm() {
       await this.$refs.ruleForm.validate(async (valid) => {
         if (valid) {
-          this.loading = true;
-          const { bargain_price, result_info_id, bargain_remark, cost_price } =
-            JSON.parse(JSON.stringify(this.ruleForm));
-          const { bidNo, sale_price, is_gold_price, can ,sale_cost_fee} = this.sitem;
-          //根据实时金价对接口进行不同传参
-          if (is_gold_price == "1" && can[0].id == 6) {
-            if (sale_cost_fee * 100 <= cost_price * 100) {
-              this.$message.warning("期望工艺费不能大于等于当前工艺费！");
-              this.loading = false;
-              return;
-            }
-            const model = {
-              bidNo: bidNo,
-              bargain_price: "0", //议价金额固定0
-              result_info_id,
-              bargain_remark,
-              cost_price: cost_price,
-            };
+          // this.loading = true;
+          const { bidNo, sale_price, is_gold_price, can, sale_cost_fee } =
+            this.sitem;
+          // const { bargain_price, result_info_id, bargain_remark, cost_price } =
+          //   JSON.parse(JSON.stringify(this.ruleForm));
 
-            let res = await asyncRequest.bargain_add(model);
-            this.loading = false;
-            if (res && res.code === 0) {
-              this.$notify.success({
-                title: "议价流程创建成功！",
-                message: "",
-              });
-              this.showModelThis = false;
-              // 刷新
-              this.$emit("refresh");
-            } else if (res && res.code >= 100 && res.code <= 104) {
-              await this.logout();
-            } else {
-              this.$message.warning(res.message);
-            }
-          } else {
-            if (sale_price * 100 <= bargain_price * 100) {
-              this.$message.warning("期望售价不能大于等于当前售价！");
-              this.loading = false;
-              return;
-            }
-            const model = {
-              bidNo: bidNo,
-              bargain_price: bargain_price, // 账号
-              result_info_id,
-              bargain_remark,
-              cost_price: "0", //工艺费固定0
-            };
+          let model = JSON.parse(JSON.stringify(this.ruleForm));
+          console.log(model);
+          delete model["result_info_id_name"];
 
-            let res = await asyncRequest.bargain_add(model);
-            this.loading = false;
-            if (res && res.code === 0) {
-              this.$notify.success({
-                title: "议价流程创建成功！",
-                message: "",
-              });
-              this.showModelThis = false;
-              // 刷新
-              this.$emit("refresh");
-            } else if (res && res.code >= 100 && res.code <= 104) {
-              await this.logout();
-            } else {
-              this.$message.warning(res.message);
-            }
+          //根据实时金价对接口进行不同传参
+          if (
+            is_gold_price == "1" &&
+            can &&
+            can.length > 0 &&
+            can[0].id + "" == "6"
+          ) {
+            model.bargain_price = "0";
+          } else {
+            model.cost_price = "0";
           }
-          // if (sale_price * 100 === bargain_price * 100) {
-          //   this.$message.warning("期望售价不能等于当前售价！");
-          //   this.loading = false;
-          //   return;
-          // }
-          // const model = {
-          //   bidNo: bidNo,
-          //   bargain_price: bargain_price, // 账号
-          //   result_info_id,
-          //   bargain_remark,
-          //   cost_price:"0",  //工艺费固定0
-          // };
 
-          // let res = await asyncRequest.bargain_add(model);
-          // this.loading = false;
-          // if (res && res.code === 0) {
-          //   this.$notify.success({
-          //     title: "议价流程创建成功！",
-          //     message: "",
-          //   });
-          //   this.showModelThis = false;
-          //   // 刷新
-          //   this.$emit("refresh");
-          // } else if (res && res.code >= 100 && res.code <= 104) {
-          //   await this.logout();
-          // } else {
-          //   this.$message.warning(res.message);
-          // }
+          let res = await asyncRequest.bargain_add(model);
+          this.loading = false;
+          if (res && res.code === 0) {
+            this.$notify.success({
+              title: "议价流程创建成功！",
+              message: "",
+            });
+            this.showModelThis = false;
+            // 刷新
+            this.$emit("refresh");
+          } else if (res && res.code >= 100 && res.code <= 104) {
+            await this.logout();
+          } else {
+            this.$message.warning(res.message);
+          }
         } else {
           console.log("error submit!!");
           return false;