暂存

src/apis/service/sellOut/zixunOrder/index.js

@@ -6,23 +6,26 @@ export default {
   detail: (data, params) => http(api + "consultzxinfo", data, "post", params),
   // 更新
   update: (data, params) => http(api + "zxedit", data, "post", params),
+  // 修改状态
+  status: (data, params) => http(api + "consultbar", data, "post", params),
+  // 分页查询 反馈列表
+  feedList: (data, params) => http(api + "consultbidlist", data, "post", params),
+
 
 
   // 添加
   add: (data, params) => http(api + "consultcreate", data, "post", params),
   // 分页查询项目列表
   plist: (data, params) => http(api + "projectlist", data, "post", params),
+
   // 删除
   delete: (data, params) => http(api + "delete", data, "post", params),
   // 分页查询
   list: (data, params) => http(api + "consultlists", data, "post", params),
   // 项目详情
   pdetail: (data, params) => http(api + "projectinfo", data, "post", params),
-  // 分页查询
-  feedList: (data, params) => http(api + "consultbidlist", data, "post", params),
 
-  // 修改状态
-  status: (data, params) => http(api + "afterstatus", data, "post", params),
+
   // 异常原因接口
   reasonList: (data, params) => http(api + "resultlist", data, "post", params),
   // 物流反馈

src/components/globalComponents/search-metal-kind/main.vue

@@ -69,14 +69,14 @@ export default {
   },
   watch: {
     value: function (val, old) {
-      console.log("111" + val);
+      // console.log("111" + val);
       this.valuess = val;
       if (this.isDetail) {
         this.remoteMethod();
       }
     },
     isDetail: function (val, old) {
-      console.log(val, old, this.isDetail, "2");
+      // console.log(val, old, this.isDetail, "2");
       if (val) {
         this.remoteMethod();
       }

src/components/globalComponents/search-sort/main.vue

@@ -65,14 +65,14 @@ export default {
   },
   watch: {
     names: function (val, old) {
-      console.log(val, old, this.isDetail, "1");
+      // console.log(val, old, this.isDetail, "1");
       this.searchName = val;
       if (this.isDetail && this.searchName) {
         this.remoteMethod(this.searchName);
       }
     },
     isDetail: function (val, old) {
-      console.log(val, old, this.isDetail, "2");
+      // console.log(val, old, this.isDetail, "2");
       if (val && this.searchName) {
         this.remoteMethod(this.searchName);
       }

src/components/globalComponents/select-area/main.vue

@@ -37,16 +37,16 @@ export default {
    * 事件集合
    * @selectChange            : 选中值变化调用   抛出选中数据
    */
-  // watch: {
-  //   value: function (val, old) {
-  //     // if (val) {
-  //     //   this.loading = true;
-  //     //   setTimeout(() => {
-  //     //     this.loading = false;
-  //     //   }, 10);
-  //     // }
-  //   },
-  // },
+  watch: {
+    value: function (val, old) {
+      if (val) {
+        this.loading = true;
+        setTimeout(() => {
+          this.loading = false;
+        }, 10);
+      }
+    },
+  },
   data() {
     return {
       loading: false,

src/views/purchaseIn/workbench/components/baseForm.vue

@@ -33,6 +33,7 @@
             :value="ruleForm.supplierNo"
             :placeholder="'供应商'"
             :size="'mini'"
+            :names="supplierNo_name"
             :disabled="type === 'view'"
             :isDetail="type !== 'add'"
             @searchChange="supplierNosearchChange"
@@ -210,13 +211,13 @@
               </el-table-column>
             </el-table>
             <!-- 弹窗 新增/修改 -->
-            <!-- <base-form-add-edit
+            <base-form-add-edit
               :index="modelIndex"
               :show-model="showOtherModel"
               :sitem="modelSitem"
               @refresh="refreshEdit"
               @cancel="showOtherModel = false"
-            /> -->
+            />
           </el-col>
         </el-row>
       </el-col>
@@ -431,7 +432,7 @@
         </el-form-item>
       </el-col>
 
-      <el-col :span="24" v-if="is_noble">
+      <el-col :span="24" v-show="is_noble">
         <el-col :span="6">
           <el-form-item label="金属重量" prop="noble_weight">
             <digital-input
@@ -454,8 +455,8 @@
             <search-metal-kind
               :value="ruleForm.metal_id"
               :size="'mini'"
-              :disabled="type === 'view'"
-              :isDetail="type !== 'add'"
+              :disabled="true"
+              :isDetail="true"
               :placeholder="'金属种类'"
               @searchChange="metal_idsearchChange"
             />
@@ -635,6 +636,7 @@ export default {
   data() {
     return {
       cat_id_name: "",
+      supplierNo: "",
       brand_name: "",
       unit_name: "",
       title: "",
@@ -659,7 +661,7 @@ export default {
       options10: options10,
       options11: options11,
       ruleForm: {},
-      rules: rules,
+      rules: JSON.parse(JSON.stringify(rules)),
     };
   },
   mounted() {
@@ -667,6 +669,7 @@ export default {
   },
   methods: {
     async initForm() {
+      this.supplierNo = [];
       console.log(this.id);
       this.loading = true;
       if (this.type === "add") {
@@ -676,13 +679,15 @@ export default {
       } else {
         this.title = "采返商品详情";
       }
+      console.log(this.type);
       this.resetFormData();
       this.rulesThis = this.rules;
       await this.resetForm();
+
       if (this.type === "edit" || this.type === "view") {
         await this.initData();
       }
-
+      this.setrules();
       this.loading = false;
     },
 
@@ -701,7 +706,7 @@ export default {
           bidNo,
           good_name, //string	名称
           cat_id, //array 分类
-          cat_name,
+          cat_info,
           brand_id, //string	品牌id
           unit, //	string	单位
           unit_id, //单位ID
@@ -728,9 +733,6 @@ export default {
           delivery_fee, //	string	物流费
           status, //		string	状态
           brand_name,
-          color, //颜色
-          model, //型号
-          material, //材质
           work_day,
           pay_way,
           send_way,
@@ -738,45 +740,36 @@ export default {
           config,
           nake_fee,
           other_config,
+          supplierName,
+          specinfo,
         } = JSON.parse(JSON.stringify(data));
-
+        if (specinfo && specinfo.length > 0) {
+          this.spec_tableData = JSON.parse(JSON.stringify(specinfo));
+        }
+        this.cat_id_name = "";
+        if (cat_info && cat_info.length) {
+          cat_info.forEach((e, ei) => {
+            this.cat_id_name += `${ei !== 0 ? "_" : ""}${e.name}`;
+          });
+        }
+        this.supplierNo_name = supplierName || "";
+        console.log(this.supplierNo_name);
         this.is_noble = this.askItem.is_metal;
-        this.cat_id_name =
-          this.type === "add" ? this.askItem.cat_name : cat_name || "";
-        console.log(this.cat_id_name);
-        console.log(this.askItem);
-        this.brand_name =
-          this.type === "add" ? this.askItem.brand : brand_name || "";
-        this.unit_name =
-          this.type === "add" ? this.askItem.unit_name : unit || "";
+        this.brand_name = brand_name || "";
+        this.unit_name = unit || "";
         this.ruleForm = {
           infoNo: this.id || "",
           bidNo: bidNo || "",
           infoNo: this.id || "",
-          cat_id: this.type === "add" ? [this.askItem.cat_id] : [cat_id] || [],
+          cat_id: cat_id ? [cat_id] : [],
           supplierNo: supplierNo ? [supplierNo] : [],
-          pname: this.type === "add" ? this.askItem.good_name : good_name || "",
+          pname: good_name || "",
           expire_day: expire_day || "0", //有效期
           delivery_day: delivery_day || "0", //物流时间
           work_day: work_day || "0", //生产工期
-          color: this.type === "add" ? this.askItem.color : color || "",
-          model: this.type === "add" ? this.askItem.model : model || "",
-          material:
-            this.type === "add" ? this.askItem.material : material || "",
-          brandid:
-            this.type === "add" && this.askItem.brand_id
-              ? [this.askItem.brand_id]
-              : brand_id
-              ? [brand_id]
-              : [],
-          unit_id:
-            this.type === "add"
-              ? [this.askItem.unit]
-              : unit_id
-              ? [unit_id]
-              : [],
-          weight:
-            this.type === "add" ? this.askItem.total_weight : weight || "0.000",
+          brandid: brand_id ? [brand_id] : [],
+          unit_id: unit_id ? [unit_id] : [],
+          weight: weight || "0.000",
           tax: tax ? tax + "%" : "",
           supply_area: supply_area || "",
           origin_place: origin_place ? origin_place.split(",") : [],
@@ -790,28 +783,20 @@ export default {
           nake_fee: nake_fee || "0.00",
           pay_way: pay_way || "",
           send_way: send_way || "",
-          noble_weight:
-            this.type === "add"
-              ? this.askItem.specs_weight
-              : noble_weight || "0.000",
+          noble_weight: noble_weight || "0.000",
 
-          metal_id:
-            this.type === "add" ? this.askItem.metal_id : metal_id || "",
-          is_gold_price:
-            this.type === "add"
-              ? this.askItem.is_gold_price
-              : is_gold_price || "",
+          metal_id: metal_id || "",
+          is_gold_price: is_gold_price || "",
           is_diff: is_diff || "",
-          config: config ? [config] : [],
+          config: config ? config.split(",") : [],
           other_config: other_config || "",
           remark: remark || "",
           cost_desc: cost_desc || "",
-          good_img:
-            this.type === "add" ? this.askItem.good_img : good_img || "",
+          good_img: good_img || "",
         };
 
-        console.log(this.ruleForm);
         this.status = status;
+        console.log(this.ruleForm.origin_place);
       } else if (code >= 100 && code <= 104) {
         await this.logout();
       } else {
@@ -822,7 +807,11 @@ export default {
       await this.$refs.ruleForm.validate(async (valid) => {
         if (valid) {
           this.loading = true;
-
+          if (this.spec_tableData.length === 0) {
+            this.$message.warning("请填写规格！");
+            this.loading = false;
+            return;
+          }
           let model = JSON.parse(JSON.stringify(this.ruleForm));
           model.cat_id = model.cat_id[model.cat_id.length - 1];
           model.brandid = model.brandid.toString();
@@ -831,6 +820,15 @@ export default {
           model.unit_id = model.unit_id.toString();
           model.config = model.config.toString();
           model.tax = parseInt(model.tax + "") + "";
+          model.specinfo = [];
+          let list = JSON.parse(JSON.stringify(this.spec_tableData));
+          list.forEach((a) => {
+            let am = {
+              specid: a.specid,
+              spec_value_id: a.spec_value_id,
+            };
+            model.specinfo.push(am);
+          });
           console.log(model);
           let res = {};
           if (this.type === "add") {
@@ -850,6 +848,10 @@ export default {
             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!!");
@@ -864,12 +866,12 @@ export default {
         if (this.$refs.ruleForm) {
           this.$refs.ruleForm.resetFields();
           this.$refs.ruleForm.clearValidate();
+          this.spec_tableData = [];
           console.log(this.askItem);
           // const { can_id_arr } = this.askItem;
           this.is_noble = this.askItem.is_metal;
-          this.cat_id_name = this.type === "add" ? this.askItem.cat_name : "";
-          // console.log(this.cat_id_name);
-          // console.log(this.askItem);
+          this.cat_id_name = this.type === "add" ? this.askItem.can_name : "";
+
           this.brand_name = this.type === "add" ? this.askItem.brand : "";
           this.unit_name = this.type === "add" ? this.askItem.unit_name : "";
           this.ruleForm = {
@@ -880,9 +882,6 @@ export default {
             expire_day: "0", //有效期
             delivery_day: "0", //物流时间
             work_day: "0", //生产工期
-            color: this.type === "add" ? this.askItem.color : "",
-            model: this.type === "add" ? this.askItem.model : "",
-            material: this.type === "add" ? this.askItem.material : "",
             brandid:
               this.type === "add" && this.askItem.brand_id
                 ? [this.askItem.brand_id]
@@ -908,12 +907,22 @@ export default {
             is_gold_price:
               this.type === "add" ? this.askItem.is_gold_price : "",
             is_diff: "",
-            config: [],
-            other_config: "",
+            config:
+              this.type === "add"
+                ? this.askItem.config
+                  ? this.askItem.config.split(",")
+                  : []
+                : [],
+            other_config: this.type === "add" ? this.askItem.other_config : "",
             remark: "",
-            cost_desc: "",
+            cost_desc: this.type === "add" ? this.askItem.cost_desc : "",
             good_img: this.type === "add" ? this.askItem.good_img : "",
           };
+          if (this.type === "add") {
+            this.spec_tableData = JSON.parse(
+              JSON.stringify(this.askItem.specinfo)
+            );
+          }
         }
       });
     },
@@ -944,14 +953,23 @@ export default {
     //分类选择
     async cat_id_change(e) {
       const { pid, id, label } = e;
-      if (id) {
-        this.ruleForm.cat_id = [id];
-        this.is_noble = pid === "6";
-      } else {
-        this.ruleForm.cat_id = [];
-        this.is_noble = false;
-      }
+      this.ruleForm.cat_id = id ? [id] : [];
+      this.is_noble = pid === "6";
       this.$refs.ruleForm.validateField("cat_id");
+      this.setrules();
+    },
+    setrules() {
+      let list = [
+        "noble_weight",
+        "metal_id",
+        "is_gold_price",
+        "is_diff",
+        "config",
+        "other_config",
+      ];
+      for (let i = 0; i < list.length; i++) {
+        this.rules[list[i]][0].required = this.is_noble;
+      }
     },
 
     //品牌选择
@@ -1105,6 +1123,50 @@ export default {
         good_img: "",
       };
     },
+    addFormData() {
+      this.status = "";
+      this.is_noble = false;
+      this.cat_id_name = "";
+      this.brand_name = "";
+      this.unit_name = "";
+      this.ruleForm = {
+        infoNo: "",
+        cat_id: [],
+        supplierNo: [],
+        pname: "",
+        expire_day: "0", //有效期
+        delivery_day: "0", //物流时间
+        work_day: "0", //生产工期
+        color: "",
+        model: "",
+        material: "",
+        brandid: [],
+        unit_id: [],
+        weight: "0.000",
+        tax: "",
+        supply_area: "",
+        origin_place: [],
+        cert_fee: "0.00",
+        pakge_fee: "0.00",
+        cost_fee: "0.00",
+        mark_fee: "0.00",
+        demo_fee: "0.00",
+        open_fee: "0.00",
+        delivery_fee: "0.00",
+        nake_fee: "0.00",
+        pay_way: "",
+        send_way: "",
+        noble_weight: "0.000",
+        metal_id: "",
+        is_gold_price: "",
+        is_diff: "",
+        config: [],
+        other_config: "",
+        remark: "",
+        cost_desc: "",
+        good_img: "",
+      };
+    },
   },
 };
 </script>

src/views/purchaseIn/workbench/detail.vue

@@ -83,7 +83,7 @@
               </li>
               <li v-if="sitem.is_metal">金属种类：</li>
               <li v-if="sitem.is_metal">
-                {{ sitem.metal_name}}
+                {{ sitem.metal_name }}
               </li>
 
               <li>工艺说明：</li>
@@ -119,7 +119,7 @@
         </template>
       </div>
       <div class="bottom">
-         <el-table
+        <el-table
           :data="tableData"
           border
           stripe
@@ -160,23 +160,20 @@
             show-overflow-tooltip
           />
           <el-table-column
-            prop="color"
-            label="颜色"
+            prop="specinfo"
+            label="规格"
             width="100"
             show-overflow-tooltip
-          />
-          <el-table-column
-            prop="model"
-            label="型号"
-            width="100"
-            show-overflow-tooltip
-          />
-          <el-table-column
-            prop="material"
-            label="材质"
-            width="100"
-            show-overflow-tooltip
-          />
+          >
+            <template slot-scope="scope">
+              <span v-for="(item, ii) in scope.row.specinfo" :key="item + ii"
+                ><span v-if="ii !== 0">--</span>{{ item.spec_name }}[{{
+                  item.spec_value_name
+                }}]</span
+              >
+            </template></el-table-column
+          >
+
           <el-table-column
             prop="unit"
             label="单位"
@@ -225,7 +222,7 @@
               </el-tooltip>
             </template>
           </el-table-column>
-        </el-table> 
+        </el-table>
       </div>
     </div>
     <div v-else>
@@ -329,7 +326,7 @@ export default {
           this.sitem.can_id_arr = [];
           this.sitem.can_name = "";
         }
-        console.log(this.sitem.can_id_arr);
+        // console.log(this.sitem.can_id_arr);
         this.status = status;
         this.getNewTime();
       } else if (code >= 100 && code <= 104) {
@@ -356,7 +353,7 @@ export default {
         this.parmValue
       );
       if (code === 0) {
-        const {list}=data
+        const { list } = data;
         this.tableData = list;
       } else if (code >= 100 && code <= 104) {
         await this.logout();

src/views/sellOut/zixunOrder/columns.js

@@ -427,10 +427,15 @@ const edutRules = {
 };
 const feedbackListCol = [
   {
-    prop: "zxNo",
-    label: "咨询编号",
+    prop: "bidNo",
+    label: "反馈商品编号",
     width: "160"
   },
+  {
+    prop: "sale_price",
+    label: "销售单价",
+    "width": "100"
+  },
   {
     prop: "good_img",
     label: "图片",
@@ -440,13 +445,15 @@ const feedbackListCol = [
   {
     prop: "good_name",
     label: "商品名称",
-    "width": "100"
+    "min-width": "100"
   },
   {
-    prop: "sale_price",
-    label: "销售单价",
-    "width": "100"
+    prop: "specinfo",
+    label: "型号",
+    _slot_: "specinfo",
+    "min-width": "100"
   },
+
   {
     prop: "status",
     label: "状态",
@@ -456,26 +463,20 @@ const feedbackListCol = [
   {
     prop: "expire_day",
     label: "信息有效期",
-    "width": "100"
+    "width": "85"
   },
   {
-    prop: "model",
-    label: "型号",
-    "width": "80"
+    prop: "delivery_day",
+    label: "物流时间",
+    "width": "85"
   },
   {
-    prop: "color",
-    label: "颜色",
-    "width": "80"
-  },
-  {
-    prop: "material",
-    label: "材质",
-    "width": "80"
+    prop: "work_day",
+    label: "生产工期",
+    "width": "85"
   },
 
 
-
   {
     prop: "addtime",
     label: "添加时间",
@@ -487,7 +488,7 @@ const feedbackListCol = [
     fixed: "right",
     _noset_: true,
     _slot_: "operation",
-    width: 50,
+    width: 100,
   },
 ]
 

src/views/sellOut/zixunOrder/components/ShowDataTableColumns.js

@@ -54,13 +54,13 @@ const editColumns = [
     prop: "status",
     label: "状态",
     _slot_: "status",
-    span: 6
+    span: 5
   },
 
   {
     prop: "addtime",
     label: "创建时间",
-    span: 5
+    span: 6
   },
   {
     prop: "departinfo",

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

@@ -23,149 +23,6 @@
           searchList();
         "
       >
-        <!-- <template #table-header="{}">
-          <div style="width: 100%">
-            <el-row style="padding: 0 0 0 80px">
-              <el-col :span="4" style="width: 130px">
-                <el-select
-                  :size="searchSize"
-                  v-model="parmValue.status"
-                  clearable
-                  placeholder="状态"
-                  @change="
-                    pageInfo.curr = 1;
-                    parmValue.page = 1;
-                    searchList();
-                  "
-                >
-                  <el-option
-                    v-for="item in expectOptions"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
-                  </el-option>
-                </el-select>
-              </el-col>
-              <el-col :span="4" style="width: 155px; padding-left: 10px">
-                <el-select
-                  :size="searchSize"
-                  v-model="parmValue.status"
-                  clearable
-                  placeholder="售后申请状态"
-                  @change="
-                    pageInfo.curr = 1;
-                    parmValue.page = 1;
-                    searchList();
-                  "
-                >
-                  <el-option
-                    v-for="item in serviceOptions"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
-                  </el-option>
-                </el-select>
-              </el-col>
-              <el-col :span="4" style="width: 380px; padding: 0px 0 0 10px">
-                <search-customer
-                  :value="customerCode"
-                  :size="searchSize"
-                  :placeholder="'企业客户'"
-                  @searchChange="customerChange"
-                />
-              </el-col>
-              <el-col :span="3" style="width: 66px; float: right">
-                <el-button
-                  :size="searchSize"
-                  type="primary"
-                  style="float: right; margin-left: 5px"
-                  @click="searchList"
-                >
-                  刷新
-                </el-button>
-              </el-col>
-              <el-col :span="4" class="fr" style="width: 66px">
-                <el-button
-                  type="warning"
-                  class="fr"
-                  :size="searchSize"
-                  @click="restSearch"
-                >
-                  重置
-                </el-button>
-              </el-col>
-            </el-row>
-            <el-row style="padding-top: 10px">
-              <el-col :span="4" style="width: 291px">
-                <period-date-picker
-                  :start="parmValue.start"
-                  :end="parmValue.end"
-                  :width="'134px'"
-                  :size="searchSize"
-                  @timeReturned="handleTime"
-                />
-              </el-col>
-
-              <el-col :span="4" style="width: 420px; padding: 0 0 0 10px">
-                <el-input
-                  clearable
-                  :size="searchSize"
-                  placeholder="关键字"
-                  v-model="s_input"
-                  @blur="
-                    pageInfo.curr = 1;
-                    parmValue.page = 1;
-                    searchList();
-                  "
-                  class="input-with-select"
-                >
-                  <el-select
-                    style="width: 140px"
-                    v-model="select"
-                    slot="prepend"
-                    placeholder="请选择"
-                  >
-                    <el-option label="售后申请编号" value="1" />
-                    <el-option label="销售订单编号" value="2" />
-                    <el-option label="销售出库单编号" value="3" />
-                    <el-option label="商品编号" value="4" />
-                    <el-option label="商品名称" value="5" />
-                    <el-option label="申请人" value="6" />
-                  </el-select>
-                  <el-button
-                    slot="append"
-                    icon="el-icon-search"
-                    @click="
-                      pageInfo.curr = 1;
-                      parmValue.page = 1;
-                      searchList();
-                    "
-                  ></el-button>
-                </el-input>
-              </el-col>
-
-              <el-col
-                :span="3"
-                class="fr"
-                style="width: 66px; padding: 0 0 0 10px"
-                v-if="powers.some((item) => item == '003')"
-              >
-                <el-button
-                  :size="searchSize"
-                  type="success"
-                  style="float: right"
-                  @click="
-                    routeGoto('zixunOrderDetail', { id: 'add', type: 'add' })
-                  "
-                >
-                  添加
-                </el-button>
-              </el-col>
-            </el-row>
-          </div>
-        </template> -->
         <template #good_img="{ scope }">
           <div
             v-if="scope.row.good_img"
@@ -190,30 +47,14 @@
             "
           ></el-tag>
         </template>
-        <!-- 费用承担方 -->
-        <template #post_own="{ scope }">
-          <el-tag
-            :size="tablebtnSize"
-            :type="scope.row.status == '0' ? 'warning' : ''"
-            v-text="
-              (
-                post_ownOptions.find((item) => item.id == scope.row.post_own) ||
-                {}
-              ).label || '--'
-            "
-          ></el-tag>
-        </template>
-        <!-- 期望意愿 -->
-        <template #except_code="{ scope }">
-          <el-tag
-            :size="tablebtnSize"
-            :type="scope.row.status == '0' ? 'warning' : ''"
-            v-text="
-              (options.find((item) => item.id == scope.row.except_code) || {})
-                .label || '--'
-            "
-          ></el-tag>
+        <template #specinfo="{ scope }">
+          <span v-for="(si, sii) in scope.row.specinfo" :key="si.specid + sii">
+            <span v-if="sii !== 0"></span>{{ si.spec_name }}[{{
+              si.spec_value_name
+            }}]</span
+          >
         </template>
+
         <template #operation="{ scope }">
           <el-tooltip
             v-if="powers.some((item) => item == '007')"
@@ -230,6 +71,17 @@
                 })
               "
             ></i>
+          </el-tooltip>
+               <el-tooltip
+            v-if="powers.some((item) => item == '007')"
+            effect="dark"
+            content="发起议价流程"
+            placement="top"
+          >
+            <i
+              class="el-icon-s-flag tb-icon"
+              @click=" "
+            ></i>
           </el-tooltip>
         </template>
       </ex-table>
@@ -403,13 +255,12 @@ export default {
       this.isDetail = isDetail;
       this.sitem = sitem;
     },
-   
+
     // 列表搜索
     async searchList() {
-   
       this.loading = true;
-      this.parmValue.infoNo = this.id
-  
+      this.parmValue.infoNo = this.id;
+
       const res = await asyncRequest.feedList(this.parmValue);
       if (res && res.code === 0 && res.data) {
         this.tableData = res.data.list;

src/views/sellOut/zixunOrder/detail.vue

@@ -4,6 +4,36 @@
       class="zixunOrderDetail-main"
       v-if="powers && powers.length > 0 && powers.some((item) => item == '007')"
     >
+      <show-data-table
+        style="padding: 10px 0 5px 0"
+        :newTime="newTime"
+        v-if="newTime !== '' && queryType === 'view'"
+        :sitem="sitem"
+        :columns="editColumns"
+      >
+        <template slot="status">
+          <el-tag
+            :size="tablebtnSize"
+            v-text="
+              (options.find((item) => item.id == sitem.status) || {}).label ||
+              '--'
+            "
+          ></el-tag>
+          <i
+            v-if="sitem.status === '1'"
+            class="el-icon-video-pause"
+            style="margin: 0 0 0 10px"
+            @click="changeStatus('2')"
+          ></i>
+        </template>
+
+        <template slot="departinfo">
+          <span>{{ sitem.salesman }}--</span>
+          <span v-for="(si, sii) in sitem.departinfo" :key="si + sii"
+            ><span v-if="sii !== 0">/</span>{{ si.name }}</span
+          >
+        </template>
+      </show-data-table>
       <el-tabs v-model="projectTabs">
         <el-tab-pane label="新建咨询单" name="0" v-if="queryType === 'add'">
           <add-form
@@ -16,90 +46,23 @@
           />
         </el-tab-pane>
         <el-tab-pane label="咨询单详情" name="1" v-if="queryType !== 'add'">
-          <el-collapse v-model="projectNames" style="margin: -18px 0 0 0">
-            <el-collapse-item title="咨询单详情" name="0">
-              <show-data-table
-                :newTime="newTime"
-                v-if="newTime !== '' && queryType === 'view'"
-                :sitem="sitem"
-                :columns="editColumns"
-              >
-                <template slot="status">
-                  <el-tag
-                    :size="tablebtnSize"
-                    v-text="
-                      (options.find((item) => item.id == sitem.status) || {})
-                        .label || '--'
-                    "
-                  ></el-tag>
-                </template>
-
-                <template slot="departinfo">
-                  <span>{{ sitem.salesman }}--</span>
-                  <span v-for="(si, sii) in sitem.departinfo" :key="si + sii"
-                    ><span v-if="sii !== 0">/</span>{{ si.name }}</span
-                  >
-                </template>
-              </show-data-table>
-              <edit-form
-                v-if="newTime !== ''"
-                :newTime="newTime"
-                :id="queryId"
-                :type="queryType"
-                :sitem="sitem"
-                @refresh="refresh"
-              />
-            </el-collapse-item>
-            <el-collapse-item
-              title="咨询单反馈详情"
-              name="0"
-              v-if="queryType == 'view'"
-            >
-              <feedback-list
-                v-if="newTime !== ''"
-                :newTime="newTime"
-                :id="queryId"
-              />
-            </el-collapse-item>
-
-            <el-collapse-item
-              title="采购部定价"
-              name="2"
-              v-if="
-                status == '1' &&
-                powers.some((item) => item == '057') &&
-                queryType == 'view'
-              "
-            >
-              444
-            </el-collapse-item>
-
-            <el-collapse-item
-              title="财务定价"
-              name="3"
-              v-if="
-                status == '2' &&
-                powers.some((item) => item == '058') &&
-                queryType == 'view'
-              "
-            >
-              555
-            </el-collapse-item>
-
-            <el-collapse-item
-              title="财务审核定价"
-              name="4"
-              v-if="
-                status == '3' &&
-                powers.some((item) => item == '059') &&
-                queryType == 'view'
-              "
-            >
-              666
-            </el-collapse-item>
-          </el-collapse>
+          <edit-form
+            v-if="newTime !== ''"
+            :newTime="newTime"
+            :id="queryId"
+            :type="queryType"
+            :sitem="sitem"
+            @refresh="refresh"
+          />
+        </el-tab-pane>
+        <el-tab-pane label="咨询单反馈情况" name="2" v-if="queryType == 'view'">
+          <feedback-list
+            v-if="newTime !== ''"
+            :newTime="newTime"
+            :id="queryId"
+          />
         </el-tab-pane>
-        <el-tab-pane label="审批记录" name="2" v-if="queryType == 'view'">
+        <el-tab-pane label="审批记录" name="3" v-if="queryType == 'view'">
           111
         </el-tab-pane>
       </el-tabs>
@@ -192,43 +155,7 @@ export default {
 
       this.loading = false;
     },
-    // 点击业务审核的保存按钮
 
-    async examForm(e) {
-      console.log(e);
-      if (!this.loading) {
-        let model = {
-          activity_code: this.queryId,
-          status: e.state === "1" ? "1" : "8",
-          remark: e.remark,
-        };
-        await this.setstatus("提交产品部门审核", model);
-      }
-    },
-    async setstatus(detail, model) {
-      await this.$confirm(`确定要${detail}？`, {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(async () => {
-          let res = await asyncRequest.actstatus(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);
-          }
-        })
-        .catch(() => {
-          console.log("取消");
-        });
-    },
     handleClick(row) {
       console.log(row);
     },
@@ -266,6 +193,79 @@ export default {
     getNewTime() {
       this.newTime = new Date().valueOf();
     },
+    /**
+     * 停止招标任务
+     * @param {String} id id
+     * @param {String} status 0-禁用 1-启用
+     */
+    async changeStatus(status) {
+      await this.$confirm(`确定要停止招标任务么？`, {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(async () => {
+          this.loading = true;
+          let model = {
+            infoNo: this.queryId,
+            status: status,
+          };
+          const res = await asyncRequest.status(model);
+          console.log(res);
+          this.loading = false;
+          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("取消");
+        });
+    },
+    // 点击业务审核的保存按钮
+
+    async examForm(e) {
+      console.log(e);
+      if (!this.loading) {
+        let model = {
+          activity_code: this.queryId,
+          status: e.state === "1" ? "1" : "8",
+          remark: e.remark,
+        };
+        await this.setstatus("提交产品部门审核", model);
+      }
+    },
+    async setstatus(detail, model) {
+      await this.$confirm(`确定要${detail}？`, {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(async () => {
+          let res = await asyncRequest.actstatus(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);
+          }
+        })
+        .catch(() => {
+          console.log("取消");
+        });
+    },
   },
 };
 </script>

src/views/serviceParam/Invoicing/index.vue

@@ -126,7 +126,7 @@
                   :size="searchSize"
                   type="success"
                   style="float: right"
-                  @click="openModal('add', false)"
+                  @click="openModal({ id: 'add' }, '003')"
                 >
                   添加
                 </el-button>
@@ -183,7 +183,7 @@
           >
             <i
               class="el-icon-view tb-icon"
-              @click="openModal(scope.row.id, true)"
+              @click="openModal(scope.row, '007')"
             ></i>
           </el-tooltip>
           <el-tooltip
@@ -194,7 +194,7 @@
           >
             <i
               class="el-icon-edit tb-icon"
-              @click="openModal(scope.row.id, false)"
+              @click="openModal(scope.row, '005')"
             ></i>
           </el-tooltip>
           <el-tooltip
@@ -322,7 +322,7 @@ export default {
         {
           prop: "companyNo",
           label: "客户编码",
-          width: "125px",
+          width: "155px",
         },
         {
           prop: "companyName",
@@ -392,10 +392,15 @@ export default {
       };
       this.searchList();
     },
-    openModal(id, isDetail) {
+    openModal(row, type) {
+      const { status, id } = row;
+      if (type === "005" && status === "1") {
+        this.$message.warning("禁用后，才可以修改！");
+        return;
+      }
       this.showModel = true;
       this.modelId = id;
-      this.isDetail = isDetail;
+      this.isDetail = type === "007";
     },
     openPasswordModal(id, isDetail) {
       this.passwordModel = true;

src/views/serviceParam/business/addEdit.vue

@@ -63,7 +63,7 @@
                 <el-form-item label="企业名称：" prop="companyName">
                   <el-input
                     v-model="ruleForm.companyName"
-                   :disabled="isDetail == '007'"
+                    :disabled="isDetail == '007'"
                     placeholder="企业名称"
                     minlength="50"
                     ><template v-if="organName" slot="prepend">{{
@@ -72,7 +72,11 @@
                   >
                 </el-form-item>
               </el-col>
-              <el-col :span="24" v-if="ruleForm.region === '1'">
+              <el-col
+                :span="24"
+                v-if="ruleForm.region === '1'"
+                style="padding: 0 0 16px 0"
+              >
                 <el-table
                   :data="tableData"
                   :size="'mini'"
@@ -109,8 +113,12 @@
                     label="qq号"
                     show-overflow-tooltip
                   />
-                  <el-table-column prop="email" label="邮箱" show-overflow-tooltip />
-                  <el-table-column fixed="right"  v-if="isDetail !== '007'">
+                  <el-table-column
+                    prop="email"
+                    label="邮箱"
+                    show-overflow-tooltip
+                  />
+                  <el-table-column fixed="right" v-if="isDetail !== '007'">
                     <template slot="header" slot-scope="scope">
                       <span>操作</span>
                       <el-tooltip

src/views/serviceParam/business/index.vue

@@ -82,7 +82,7 @@
             :size="searchSize"
             type="success"
             style="float: right"
-            @click="openModal('add', '003', '0')"
+            @click="openModal({ id: 'add' }, '003', '0')"
           >
             添加
           </el-button>
@@ -150,7 +150,7 @@
             >
               <i
                 class="el-icon-view tb-icon"
-                @click="openModal(scope.row.id, '007', scope.row.kh)"
+                @click="openModal(scope.row, '007', scope.row.kh)"
               ></i>
             </el-tooltip>
             <el-tooltip
@@ -161,7 +161,7 @@
             >
               <i
                 class="el-icon-edit tb-icon"
-                @click="openModal(scope.row.id, '005', scope.row.kh)"
+                @click="openModal(scope.row, '005', scope.row.kh)"
               ></i>
             </el-tooltip>
             <el-tooltip
@@ -297,7 +297,12 @@ export default {
     this.searchList();
   },
   methods: {
-    openModal(id, type, kh) {
+    openModal(row, type, kh) {
+      const { status, id } = row;
+      if (type === "005" && status === "1") {
+        this.$message.warning("禁用后，才可以修改！");
+        return;
+      }
       this.modelId = id;
       this.kh = kh;
       this.isDetail = type;

src/views/serviceParam/supplier/components/baseForm.vue

@@ -279,7 +279,7 @@
           <el-input
             v-model="ruleForm.telephone"
             :disabled="type !== 'add' && type !== 'edit'"
-            placeholder="手机号"
+            placeholder="座机号"
             minlength="20"
           />
         </el-form-item>
@@ -298,11 +298,11 @@
         <div class="supplierAdd-title">营业执照信息</div></el-col
       >
       <el-col :span="8">
-        <el-form-item label="注册号" prop="registercode">
+        <el-form-item label="统一社会信用代码" prop="registercode">
           <el-input
             v-model="ruleForm.registercode"
             :disabled="type !== 'add' && type !== 'edit'"
-            placeholder="注册号"
+            placeholder="统一社会信用代码"
             minlength="20"
           />
         </el-form-item>
@@ -414,12 +414,12 @@ export default {
     const validateLicense = (rule, value, callback) => {
       if (value !== "") {
         if (!isLicense(value)) {
-          callback(new Error("注册号不正确！"));
+          callback(new Error("统一社会信用代码不正确！"));
         } else {
           callback();
         }
       } else {
-        callback(new Error("请输入注册号！"));
+        callback(new Error("请输入统一社会信用代码！"));
       }
     };
     const validatemobile = (rule, value, callback) => {
@@ -435,7 +435,7 @@ export default {
     };
     const validatetelephone = (rule, value, callback) => {
       if (value === "") {
-        callback(new Error("座机号不能为空！"));
+        callback();
       } else {
         if (isqz(value)) {
           callback();
@@ -637,7 +637,7 @@ export default {
         prove_img: prove_img ? (prove_img || "").split(",") : [],
         contactor: contactor || "",
         mobile: mobile || "",
-        telephone:telephone||'',
+        telephone: telephone || "",
         position: position || "",
         registercode: registercode || "",
         name: name || "",

src/views/serviceParam/supplier/index.vue

@@ -157,12 +157,7 @@
         >
           <i
             class="el-icon-edit tb-icon"
-            @click="
-              routeGoto('supplierDetail', {
-                id: scope.row.id,
-                type: 'edit',
-              })
-            "
+            @click="gotoEdit(scope.row, '005')"
           ></i>
         </el-tooltip>
         <el-tooltip
@@ -208,10 +203,7 @@
           content="查看支持品牌"
           placement="top"
         >
-          <i
-            class="el-icon-search tb-icon"
-            @click="openModal(scope.row)"
-          ></i>
+          <i class="el-icon-search tb-icon" @click="openModal(scope.row)"></i>
         </el-tooltip>
       </template>
     </ex-table>
@@ -316,7 +308,7 @@ export default {
         {
           prop: "creater",
           label: "创建人",
-           width: "100",
+          width: "100",
         },
         {
           prop: "addtime",
@@ -375,6 +367,17 @@ export default {
         await this.searchList();
       }
     },
+    gotoEdit(row, type) {
+      const { status } = row;
+      if (type === "005" && status === "1") {
+        this.$message.warning("禁用后，才可以修改！");
+        return;
+      }
+      this.routeGoto("supplierDetail", {
+        id: row.id,
+        type: "edit",
+      });
+    },
     /**
      * 启用/禁用
      * @param {String} id id

src/views/serviceParam/terrace/index.vue

@@ -331,6 +331,11 @@ export default {
     },
     // 新建/编辑/详情
     openModal(row, type) {
+      const { status } = row;
+      if (type === "005" && status === "1") {
+        this.$message.warning("禁用后，才可以修改！");
+        return;
+      }
       this.sitem = row;
       this.modelId = type;
       this.showModel = true;

src/views/serviceParam/unusualReason/index.vue

@@ -28,7 +28,7 @@
             <el-row style="padding: 0 0 0 80px">
               <el-col :span="3" style="width: 210px">
                 <el-select
-                clearable
+                  clearable
                   v-model="parmValue.type"
                   :size="searchSize"
                   placeholder="原因类型"
@@ -67,12 +67,16 @@
                   重置
                 </el-button>
               </el-col>
-              <el-col :span="3" style="width: 66px; float: right">
+              <el-col
+                :span="3"
+                style="width: 66px; float: right"
+                v-if="powers.some((item) => item == '003')"
+              >
                 <el-button
                   :size="searchSize"
                   type="success"
                   style="float: right; margin-left: 5px"
-                  @click="openModal('add', false)"
+                  @click="openModal({ id: 'add' }, '003')"
                 >
                   新建
                 </el-button>
@@ -108,7 +112,7 @@
           >
             <i
               class="el-icon-view tb-icon"
-              @click="openModal(scope.row.id, true, scope.row)"
+              @click="openModal(scope.row, '007')"
             ></i>
           </el-tooltip>
           <el-tooltip
@@ -119,7 +123,7 @@
           >
             <i
               class="el-icon-edit tb-icon"
-              @click="openModal(scope.row.id, false, scope.row)"
+              @click="openModal(scope.row, '005')"
             ></i>
           </el-tooltip>
           <el-tooltip
@@ -336,11 +340,17 @@ export default {
       };
       this.searchList();
     },
-    openModal(id, isDetail, sitem) {
-      this.showModel = true;
+    openModal(row, type) {
+      const { status, id } = row;
+      if (type === "005" && status === "1") {
+        this.$message.warning("禁用后，才可以修改！");
+        return;
+      }
+
       this.modelId = id;
-      this.isDetail = isDetail;
-      this.sitem = sitem;
+      this.isDetail = type === "007";
+      this.sitem = row;
+      this.showModel = true;
     },
     async searchList() {
       this.loading = true;

src/views/serviceParam/workCompany/addEdit.vue

@@ -53,12 +53,13 @@
                   </el-col>
                   <el-col :span="11"
                     ><el-form-item
-                      label="注册号"
+                      label="统一社会信用代码"
                       prop="inv_code"
+                      label-width="150px"
                       style="width: 100%"
                     >
                       <el-input
-                        placeholder="注册号"
+                        placeholder="统一社会信用代码"
                         filterable
                         :disabled="isDetail == '007'"
                         maxlength="40"
@@ -272,12 +273,12 @@ export default {
     const validateLicense = (rule, value, callback) => {
       if (value !== "") {
         if (!isLicense(value)) {
-          callback(new Error("注册号不正确！"));
+          callback(new Error("统一社会信用代码不正确！"));
         } else {
           callback();
         }
       } else {
-        callback(new Error("注册号不能为空！"));
+        callback(new Error("统一社会信用代码不能为空！"));
       }
     };
     const validatemobile = (rule, value, callback) => {

src/views/serviceParam/workCompany/index.vue

@@ -286,7 +286,7 @@ export default {
         {
           prop: "companyNo",
           label: "编号",
-          "width": "170px",
+          width: "170px",
         },
 
         {
@@ -296,19 +296,19 @@ export default {
         {
           prop: "status",
           label: "状态",
-          "width": "100px",
+          width: "100px",
           _slot_: "status",
         },
         {
           prop: "creater",
           label: "负责人",
-          width:'100px'
+          width: "100px",
         },
 
         {
           prop: "addtime",
           label: "创建时间",
-          "width": "145px",
+          width: "145px",
         },
         {
           prop: "",
@@ -367,10 +367,15 @@ export default {
       this.searchList();
     },
 
-    openModal(id, isDetail) {
+    openModal(row, type) {
+      const { status } = row;
+      if (type === "005" && status === "1") {
+        this.$message.warning("禁用后，才可以修改！");
+        return;
+      }
       this.showModel = true;
-      this.modelId = id;
-      this.isDetail = isDetail;
+      this.modelId = row.id;
+      this.isDetail = type;
     },
     async searchList() {
       this.loading = true;