Merge branch 'sit'

src/views/sellOut/bargainList/detail.vue

@@ -421,19 +421,20 @@ export default {
 
     async examFormSubmit(e, title) {
       if (!this.loading) {
+        const {state,remark}=e
         let model = {
           bargainNo: this.queryId,
-          status: e.state,
-          remark: e.remark,
+          status: state,
+          remark: remark,
         };
-        await this.$confirm(`确定要${title}？`, {
+        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) {
+            if (this.status === "7" && after_price * 1 < lower_price * 1&&state+''==='1') {
               this.loading = false;
               await this.$confirm(
                 `当前商品同意议价后，售价已低于系统最低售价${this.sitem.lower_price}元！`,

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

@@ -145,7 +145,6 @@
       </template>
     </ex-table>
     <add-edit-bargain
-    
       :showModel="wantBmodel"
       :sitem="wantBsitem"
       @cancel="wantBmodel = false"
@@ -175,8 +174,12 @@
       @close="show_reject_model = false"
       append-to-body
     >
-      <ul v-for="(item, index) in show_reject_item" :key="item.id + index" style="margin:-20px 0 0 0">
-        <li style="line-height: 20px; padding:  0 0 16px 0 ">
+      <ul
+        v-for="(item, index) in show_reject_item"
+        :key="item.id + index"
+        style="margin: -20px 0 0 0"
+      >
+        <li style="line-height: 20px; padding: 0 0 16px 0">
           驳回节点：{{
             (baoptions.find((it) => it.id == item.status) || {}).label || "--"
           }}
@@ -244,13 +247,18 @@ export default {
       is_project: false,
       customerCode: [], //客户公司code
       baoptions: [
-        { id: "1", label: "待业务主管审批" },
-        { id: "2", label: "待财务专员审批" },
-        { id: "3", label: "待财务主管审批" },
-        { id: "4", label: "审批通过" },
-        { id: "5", label: "业务主管驳回" },
-        { id: "6", label: "财务主管驳回" },
-        { id: "7", label: "已取消议价" },
+        { 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" },
       ],
       options: [
         { id: "0", label: "待发布竞标" },