Merge branch 'sit'

src/assets/css/common.scss

@@ -74,10 +74,10 @@ html,
 body {
   height: 100%;
   width: 100%;
-  position: relative;
-  padding:0;
-  margin: 0;
-  min-height: 100%;
+  // position: relative;
+  // padding:0;
+  // margin: 0;
+  // min-height: 100%;
 }
 html{
   display: block;

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

@@ -71,6 +71,15 @@ export default {
     value: function (val, old) {
       console.log("111" + val);
       this.valuess = val;
+      if (this.isDetail) {
+        this.remoteMethod();
+      }
+    },
+    isDetail: function (val, old) {
+      console.log(val, old, this.isDetail, "2");
+      if (val) {
+        this.remoteMethod();
+      }
     },
   },
   mounted() {

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/layout/components/AppMain.vue

@@ -25,8 +25,8 @@ export default {
 <style lang="scss" scoped>
 .app-main {
   /* 50= navbar  50  */
-  min-height: calc(100% - 0px);
   width: 100%;
+  height: 100%;
   position: relative;
   // overflow: hidden;
   background: #fff;
@@ -37,6 +37,7 @@ export default {
 
 .fixed-header + .app-main {
   padding: 50px 0 0 0;
+  height: 100%;
 }
 
 .hasTagsView {

src/views/goodStore/dealGoodsPool/columns.js

@@ -337,7 +337,7 @@ const rules = {
   good_thumb_img: [
     {
       required: true,
-      message: "商品缩略图",
+      message: "商品主图",
       trigger: "change",
     },
   ],

src/views/goodStore/goodsCost/columns.js

@@ -366,17 +366,10 @@ const rules = {
   good_thumb_img: [
     {
       required: true,
-      message: "商品缩略图",
+      message: "商品主图",
       trigger: "change",
     },
   ],
-  // good_img: [
-  //   {
-  //     required: true,
-  //     message: "商品详情主图",
-  //     trigger: "change",
-  //   },
-  // ],
   good_info_img: [
     {
       type: "array",

src/views/goodStore/goodsCost/components/baseForm.vue

@@ -696,7 +696,7 @@
         <el-row style="padding: 0 0 20px 0">
           <el-col :span="8">
             <el-form-item
-              label="缩略图"
+              label="商品主图"
               prop="good_thumb_img"
               class="activity-upload"
             >

src/views/purchaseIn/workbench/add.vue

@@ -1,122 +0,0 @@
-<template>
-  <div class="activeAdd pagePadding">
-    <div
-      v-if="powers && powers.length > 0 && powers.some((item) => item == '007')"
-    >
-      <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
-        <el-tab-pane label="基础/规格" name="1"> <base-form /></el-tab-pane>
-        <el-tab-pane label="包装/发货/图片" name="2">
-          <pack-form
-        /></el-tab-pane>
-        <el-tab-pane label="固定/阶梯成本" name="3"> <cost-form /></el-tab-pane>
-      </el-tabs>
-    </div>
-    <div v-else>
-      <no-auth></no-auth>
-    </div>
-  </div>
-</template>
-   <script>
-import asyncRequest from "@/apis/service/goodStore/active";
-import resToken from "@/mixins/resToken";
-import { mapGetters } from "vuex";
-// import baseForm from "./components/baseForm";
-// import costForm from "./components/costForm";
-// import packForm from "./components/packForm";
-export default {
-  name: "activeAdd",
-  mixins: [resToken],
-  components: {
-    baseForm,
-    costForm,
-    packForm,
-  },
-  computed: {
-    ...mapGetters(["tablebtnSize", "searchSize", "size"]),
-    powers() {
-      let tran =
-        this.$store.getters.btnList.find(
-          (item) => item.menu_route == "activeAdd"
-        ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
-    },
-  },
-  data() {
-    return {
-      size: "small",
-      activeName: "3",
-      loading: false,
-   
-     
-
-    
-
-   
-    };
-  },
-  mounted() {
-    this.initForm();
-  },
-  methods: {
-    async initForm() {
-      this.loading = true;
-    
-      this.loading = false;
-    },
-    handleClick(row) {
-      console.log(row);
-    },
-    async initData() {
-      this.loading = true;
-      let res = await asyncRequest.detail({ id: this.id });
-      this.loading = false;
-      if (res.code === 0) {
-        await this.resetForm(res.data);
-      }
-    },
-  
-
-  
-   
-  },
-};
-</script>
-   <style lang="scss" scoped>
-.activeAdd {
-  .activeAdd-title {
-    border-top: 1px solid #ebeef5;
-    span {
-      height: 50px;
-      line-height: 50px;
-      font-family: "微软雅黑", sans-serif;
-      font-weight: 400;
-      font-style: normal;
-      font-size: 16fpx;
-      text-align: left;
-    }
-  }
-  /deep/ .ddiv {
-    border-top: 1px solid #dcdfe6;
-   
-  }
-  /deep/ .dtitle {
-    width: 40px;
-    text-align: center;
-    height: 100%;
-    min-height: 100%;
-    ul{
-      padding:20px 0 0 0;
-    }
-  }
-  /deep/ .dmain {
-     padding: 20px 0 0 0;
-    width: calc(100% - 40px);
-    border-left: 1px solid #dcdfe6;
-  }
-}
-</style>
-   

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

@@ -195,7 +195,7 @@
       <el-col :span="23" class="dmain">
         <el-row style="padding: 0 0 20px 0">
           <el-col :span="8">
-            <el-form-item label="缩略图" prop="c1" class="activity-upload">
+            <el-form-item label="商品主图" prop="c1" class="activity-upload">
               <div class="btnupload" style="position: relative">
                 <img v-if="ruleForm.c1" :src="ruleForm.c1" class="avatar" />
                 <i v-else class="el-icon-plus avatar-uploader-icon"></i>

src/views/purchaseIn/workbench/detail.vue

@@ -1,11 +1,11 @@
 <template>
   <div class="workbenchdetail">
     <div
-      class="page-main"
+      class="page-main clear"
       v-if="powers && powers.length > 0 && powers.some((item) => item == '007')"
     >
       <div class="left">
-        <div style="background: rgba(242, 242, 242, 1)">
+        <div class="left-main">
           <div class="left-card" v-if="sitem">
             <div class="page-main-title">招标任务信息</div>
             <ul class="page-main-ul clear">
@@ -42,12 +42,6 @@
               <li>{{ sitem.can_name }}</li>
               <li>商品品牌：</li>
               <li>{{ sitem.brand ? sitem.brand : "无要求" }}</li>
-              <!-- <li>商品规格：</li>
-              <li>{{ sitem.model }}</li>
-              <li>颜色：</li>
-              <li>{{ sitem.color }}</li>
-              <li>材质：</li>
-              <li>{{ sitem.material }}</li> -->
               <li>重量：</li>
               <li>{{ sitem.total_weight }}g</li>
               <li>是否多地：</li>
@@ -204,7 +198,6 @@
                   @click="openModal(scope.row.bidNo, 'view')"
                 ></i>
               </el-tooltip>
-              <!-- v-if="powers.some((item) => item == 'edit')" -->
               <el-tooltip effect="dark" content="修改" placement="top">
                 <i
                   class="el-icon-edit tb-icon"
@@ -261,8 +254,8 @@ export default {
       editId: "add",
       editType: "wait",
       parmValue: {
-        page:1,
-        size:100,
+        page: 1,
+        size: 100,
         zxNo: "",
         infoNo: "",
         bidNo: "",
@@ -358,32 +351,34 @@ export default {
    <style lang="scss" scoped>
 @import "~@/styles/mixin.scss";
 .workbenchdetail {
-  background: rgba(242, 242, 242, 1);
+  background: #f2f2f2;
   position: relative;
   width: 100%;
-  height: 100%;
+  height: calc(100vh - 50px);
   box-sizing: border-box;
-  padding: 16px;
+  overflow: hidden;
+
   .page-main {
+    background: #00ff00;
     position: relative;
     width: 100%;
-    height: 100%;
-    min-height: 100%;
+    height: calc(100vh - 50px);
     box-sizing: border-box;
+    // padding:16px;
     .left {
       position: absolute;
-      top: 0;
-      left: 0;
+      top: 16px;
+      left: 16px;
       width: 240px;
-      height: 100%;
-      min-height: 100%;
-      > div {
+      background: #00f;
+      overflow: hidden;
+      height: calc(100vh - 82px);
+      .left-main {
+        background: rgba(242, 242, 242, 1);
         width: 100%;
-        height: 100%;
-        min-height: 100%;
         overflow-y: scroll;
         overflow-x: hidden;
-        background: #fff;
+        // background: #fff;
         @include scrollBar();
       }
     }
@@ -391,10 +386,10 @@ export default {
       top: 0;
       right: 0;
       width: calc(100% - 250px);
-      height: calc(100% - 150px);
-      min-height: calc(100% - 150px);
+      height: calc(100vh - 150px);
+      min-height: calc(100vh - 150px);
       overflow-y: scroll;
-      background: #fff;
+      // background: #fff;
       overflow-x: hidden;
       @include scrollBar();
       .right-mian-wait {

src/views/purchaseIn/workbench/index.vue

@@ -13,7 +13,7 @@
               class="aaa"
               v-for="item in list"
               :key="item"
-              @click="routeGoto('workbenchDetail', { id: 'add' })"
+              @click="routeGoto('workbenchDetail', { id: 'INF2203151428199103' })"
             >
               {{ item }}
             </div>
@@ -28,7 +28,7 @@
               class="aaa"
               v-for="item in list"
               :key="item"
-              @click="routeGoto('workbenchDetail', { id: 'add' })"
+              @click="routeGoto('workbenchDetail', { id: 'INF2203151428199103' })"
             >
               {{ item }}
             </div>

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

@@ -1,35 +1,84 @@
-export default [
+const addColumns = [
+  {
+    prop: "total_weight",
+    label: "总重量(g)",
+    span: 6
+  },
+  {
+    prop: "unit_name",
+    label: "单位",
+    span: 6
+  },
 
   {
-    prop: "zxNo",
-    label: "咨询单编号",
-    span:8
+    prop: "brand_name",
+    label: "品牌",
+    span: 12
   },
+
   {
-    prop: "status",
-    label: "咨询单状态",
-    span:8
+    prop: "cost_desc",
+    label: "工艺说明",
+    span: 12
   },
   {
-    prop: "addtime",
-    label: "创建时间",
-    span:8
+    prop: "use_desc",
+    label: "产品用途",
+    span: 12
+  },
+  {
+    prop: "remark",
+    label: "商品备注",
+    span: 12
+  },
+  {
+    prop: "cost_desc",
+    label: "工艺说明",
+    span: 12
   },
   {
-    prop: "salesman",
-    label: "申请人",
-    span:8
+    prop: "noble_type",
+    label: "贵金属信息",
+    _slot_: "noble_type",
+    span: 24
   },
- 
+]
+
+const editColumns = [
   {
-    prop: "cgder",
-    label: "申请部门",
-    span:8
+    prop: "infoNo",
+    label: "咨询单编号",
+    span: 6
   },
   {
     prop: "status",
-    label: "招标状态",
-    span:8
+    label: "状态",
+    _slot_: "status",
+    span: 6
+  },
+
+  {
+    prop: "addtime",
+    label: "创建时间",
+    span: 5
+  },
+  {
+    prop: "departinfo",
+    label: "创建人",
+    _slot_: "departinfo",
+    span: 7
   },
 ]
 
+
+
+
+
+
+
+export {
+  addColumns,
+  editColumns
+}
+
+

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

@@ -221,32 +221,31 @@
               <template slot-scope="props">
                 <show-data-table
                   :sitem="props.row"
-                  :columns="ShowDataTableColumns"
+                  :columns="addColumns"
                 >
-                  <template slot="good_name">
-                    <div>{{ sitem.good_name }}</div>
+                  <template slot="noble_type">
+                    <div>
+                      <span>贵金属克重：{{ props.row.specs_weight }}g</span>
+                      <span>--</span>
+                      <span>{{
+                        props.row.is_gold_price === "1"
+                          ? "启用实时金价"
+                          : "不启用实时金价"
+                      }}</span>
+                      <span>--</span>
+                      <span>当前金价：{{ props.row.gold_price }}元/g</span>
+                      <span>--</span>
+                      <span
+                        >配置要求：<span
+                          v-for="ii in props.row.config"
+                          :key="ii"
+                          >{{ ii }},</span
+                        ></span
+                      >
+                      <span>--</span>
+                      <span>其他配置要求：{{ props.row.other_config }}</span>
+                    </div>
                   </template>
-                  <template slot="specinfo">
-                    <span
-                      v-for="(si, i) in sitem.specinfo"
-                      :key="si.specid + i"
-                    >
-                      <span v-if="i !== 0">-</span
-                      ><span>{{ si.spec_value }}</span>
-                    </span>
-                  </template>
-
-                  <!-- <template slot="is_auth">
-                    <el-tag
-                      :size="'mini'"
-                      v-text="
-                        (
-                          options3.find((item) => item.id == sitem.is_auth) ||
-                          {}
-                        ).name || '--'
-                      "
-                    />
-                  </template> -->
                 </show-data-table>
               </template>
             </el-table-column>
@@ -266,24 +265,19 @@
               prop="num"
               label="购买数量"
               show-overflow-tooltip
-              width="110"
+              width="80"
             />
             <el-table-column
-              prop="good_name"
+              prop="cat_id_name"
               label="商品分类"
               show-overflow-tooltip
-              width="170"
-            />
-            <el-table-column
-              prop="good_name"
-              label="商品名称"
-              show-overflow-tooltip
-              width="170"
+              min-width="170"
             />
+
             <el-table-column
               prop="good_img"
-              label="商品图片"
-              width="70"
+              label="图片"
+              width="50"
               show-overflow-tooltip
             >
               <template slot-scope="scope">
@@ -297,34 +291,48 @@
                 />
               </template>
             </el-table-column>
-
             <el-table-column
-              prop="unit"
-              label="商品单位"
-              width="100"
-              v-if="!(status === '' || status === '0')"
+              prop="good_name"
+              label="商品名称"
               show-overflow-tooltip
+              min-width="170"
             />
             <el-table-column
-              prop="cost_price"
-              label="商品品牌"
-              width="100"
-              v-if="!(status === '' || status === '0')"
+              prop="specinfo"
+              label="商品规格"
               show-overflow-tooltip
-            />
-
+              width="170"
+            >
+              <template slot-scope="scope">
+                <span
+                  v-for="(si, sii) in scope.row.specinfo"
+                  :key="si.spec_name + sii"
+                  ><span v-if="sii !== 0">-</span>{{ si.spec_name }}:[{{
+                    si.spec_value_name
+                  }}]</span
+                >
+              </template>
+            </el-table-column>
             <el-table-column
-              prop="activity_price"
+              prop="is_addrs"
               label="是否多地"
-              width="100"
+              width="70"
               show-overflow-tooltip
-            />
+            >
+              <template slot-scope="scope">
+                {{ scope.row.is_addrs === "1" ? "多地" : "一地" }}
+              </template>
+            </el-table-column>
             <el-table-column
-              prop="activity_price"
+              prop="is_custom"
               label="是否定制"
-              width="100"
+              width="70"
               show-overflow-tooltip
-            />
+            >
+              <template slot-scope="scope">
+                {{ scope.row.is_custom === "1" ? "定制" : "非定制" }}
+              </template>
+            </el-table-column>
             <el-table-column fixed="right" width="80">
               <template slot="header" slot-scope="scope">
                 <span>操作</span>
@@ -343,14 +351,10 @@
                 </el-tooltip>
               </template>
               <template slot-scope="scope">
-                <el-tooltip
-                  effect="dark"
-                  content="查看商品信息"
-                  placement="top"
-                >
+                <el-tooltip effect="dark" content="修改" placement="top">
                   <i
-                    class="el-icon-view tb-icon"
-                    @click="showGoodModelFun(scope.row.skuCode)"
+                    class="el-icon-edit tb-icon"
+                    @click="openEdit(scope.$index, scope.row)"
                   ></i>
                 </el-tooltip>
                 <el-tooltip
@@ -386,7 +390,7 @@
 <script>
 import asyncRequest from "@/apis/service/sellOut/zixunOrder";
 import resToken from "@/mixins/resToken";
-import ShowDataTableColumns from "./ShowDataTableColumns";
+import {addColumns} from "./ShowDataTableColumns";
 import addEditGoodModal from "./addEditGoodModal";
 export default {
   name: "handover",
@@ -411,7 +415,7 @@ export default {
         { value: "1", label: "竞品" },
         { value: "2", label: "竞聘" },
       ],
-      ShowDataTableColumns: ShowDataTableColumns,
+      addColumns: addColumns,
       configOptions: ["证书", "包装盒", "绒布袋", "标签", "其他"],
       poptions: [],
       loading: false,
@@ -574,6 +578,7 @@ export default {
       this.multipleSelection = val;
     },
     editGoodRefresh(e) {
+      console.log(e);
       const { index } = e;
       if (index + "" === "-1") {
         this.tableData.push(JSON.parse(JSON.stringify(e)));
@@ -592,6 +597,9 @@ export default {
         this.ptableData = [];
       }
     },
+    openCostEditDelete(index) {
+      this.tableData.splice(index, 1);
+    },
     async resetForm() {
       this.resign_name = "";
       this.hand_name = "";
@@ -686,7 +694,7 @@ export default {
             };
             e.specinfo.forEach((a) => {
               let am = {
-                specid: a.spec_id,
+                specid: a.specid,
                 spec_value_id: a.spec_value_id,
               };
               im.specinfo.push(am);

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

@@ -98,8 +98,8 @@
                   <search-brand
                     :value="ruleForm.brand_id"
                     :size="'mini'"
-                    :isDetail="type !== 'add'"
-                    :names="brand_name"
+                    :isDetail="listindex !== '-1'"
+                    :names="ruleForm.brand_name"
                     :placeholder="'品牌'"
                     @searchChange="brand_id_searchChange"
                   />
@@ -144,8 +144,8 @@
                   <search-unit
                     :value="ruleForm.unit"
                     :size="'mini'"
-                    :isDetail="unit_name !== ''"
-                    :names="unit_name"
+                    :isDetail="listindex !== '-1'"
+                    :names="ruleForm.unit_name"
                     :placeholder="'单位'"
                     @searchChange="unitsearchChange"
                   />
@@ -158,8 +158,8 @@
                     :placeholder="'商品分类'"
                     :disabled="false"
                     :size="'mini'"
-                    :names="cat_id_name"
-                    :isDetail="false"
+                    :names="ruleForm.cat_id_name"
+                    :isDetail="listindex !== '-1'"
                     @searchChange="goods_class_change"
                   />
                 </el-form-item>
@@ -205,8 +205,8 @@
                   style="width: 100%"
                   height="120px"
                 >
-                  <el-table-column prop="spec_value" label="规格类型" />
-                  <el-table-column prop="spec_value_value" label="规格值" />
+                  <el-table-column prop="spec_name" label="规格类型" />
+                  <el-table-column prop="spec_value_name" label="规格值" />
                   <el-table-column fixed="right" width="88px">
                     <template slot="header" slot-scope="scope">
                       <span>操作</span>
@@ -284,7 +284,7 @@
                       />
                     </el-form-item>
                   </el-col>
-                  <el-col :span="6">
+                  <el-col :span="6" v-if="is_noble">
                     <el-form-item label="启用金价" prop="is_gold_price">
                       <el-select
                         v-model="ruleForm.is_gold_price"
@@ -339,7 +339,7 @@
                       <search-metal-kind
                         :value="ruleForm.metal_id"
                         :size="'mini'"
-                        :isDetail="type !== 'add'"
+                        :isDetail="listindex !== '-1'"
                         :placeholder="'贵金属种类'"
                         @searchChange="noble_metalsearchChange"
                       />
@@ -356,7 +356,8 @@
                         placeholder="当前金价"
                         maxlength="500"
                       >
-                       <template slot="append">元</template></el-input>
+                        <template slot="append">元</template></el-input
+                      >
                     </el-form-item>
                   </el-col>
                   <el-col :span="8" class="fr tr">
@@ -412,7 +413,6 @@ export default {
       modelSitem: {},
       showOtherModel: false,
       spec_tableData: [],
-      old_spec_tableData: [],
       loading: false,
       is_noble: false,
       is_addrs_options: [
@@ -430,15 +430,11 @@ export default {
       config_options: ["证书", "包装盒", "绒布袋", "标签", "其他"],
       title: "添加咨询商品",
       showModelThis: this.showModel,
-      findex: "-1",
-      select: "1",
       pickerOptions: {
         disabledDate(time) {
           return time.getTime() <= Date.now();
         },
       },
-      activeOptions: [],
-      actionList: [],
       ruleForm: {
         p_cat_info: [],
         p_cat_id: "",
@@ -470,9 +466,9 @@ export default {
         metal_id: "",
         gold_price: "0",
       },
-      unit_name: "",
       rulesThis: this.rules,
       rules: rules,
+      listindex: "-1",
     };
   },
   watch: {
@@ -492,9 +488,8 @@ export default {
     async initForm() {
       this.loading = true;
       const { index } = this.sitem;
-      console.log(index);
-      this.findex = index ? index + "" : "-1";
-      if (this.findex === "-1") {
+      this.listindex = index + "";
+      if (this.listindex === "-1") {
         this.title = "添加咨询商品";
       } else {
         this.title = "修改咨询商品";
@@ -514,24 +509,18 @@ export default {
     //规格编辑修改结果
     refreshEdit(e) {
       let item = JSON.parse(JSON.stringify(e));
-      const {
-        index,
-        id,
-        spec_id,
-        spec_value,
-        spec_value_id,
-        spec_value_value,
-      } = item;
+      const { index, id, specid, spec_name, spec_value_id, spec_value_name } =
+        item;
       if (index + "" === "-1") {
         this.spec_tableData.push(item);
       } else {
         this.spec_tableData.forEach((i, findex) => {
           if (i.spec_id === spec_id) {
             this.spec_tableData[findex].id = id;
-            this.spec_tableData[findex].spec_id = spec_id;
-            this.spec_tableData[findex].spec_value = spec_value;
+            this.spec_tableData[findex].specid = specid;
+            this.spec_tableData[findex].spec_name = spec_name;
             this.spec_tableData[findex].spec_value_id = spec_value_id;
-            this.spec_tableData[findex].spec_value_value = spec_value_value;
+            this.spec_tableData[findex].spec_value_name = spec_value_name;
           }
         });
       }
@@ -539,7 +528,6 @@ export default {
     },
     async resetForm() {
       this.spec_tableData = [];
-      this.old_spec_tableData = [];
       // 重置
       await this.$nextTick(() => {
         if (this.$refs.ruleForm) {
@@ -580,15 +568,24 @@ export default {
             p_good_name,
             p_good_img,
             p_arrtime,
+            brand_name,
+            specinfo,
+            cat_id_name,
+            cat_arr_id,
           } = this.sitem;
-          this.unit_name = unit_name || "";
-          console.log(p_cat_info);
+          console.log(this.sitem);
+          // console.log(p_cat_info);
           let asd = [];
           if (p_cat_info && p_cat_info.length > 0) {
             p_cat_info.forEach((sd) => {
               asd.push(sd.id);
             });
           }
+          if (specinfo && specinfo.length > 0) {
+            this.spec_tableData = JSON.parse(JSON.stringify(specinfo));
+          } else {
+            this.spec_tableData = [];
+          }
           this.ruleForm = {
             p_cat_info: p_cat_info,
             p_cat_id: p_cat_id,
@@ -600,22 +597,25 @@ export default {
             p_good_name: p_good_name,
             p_good_img: p_good_img,
             p_arrtime: p_arrtime,
+
             pgNo: fi === "-1" && p_pgNo ? p_pgNo : pgNo || "",
             arrival_time:
               fi === "-1" && p_pgNo ? p_arrtime : arrival_time || "",
             budget_price:
               fi === "-1" && p_pgNo ? p_budget_price : budget_price || "0.00",
             num: fi === "-1" && p_pgNo ? p_num : num || "0",
-            brand_id: brand_id ? [brand_id] : [],
-            cat_id: [],
-            cat_arr_id: [],
+            brand_id: brand_id ? brand_id : [],
+            brand_name: brand_name ? brand_name : "",
+            cat_id: cat_id ? cat_id : [],
+            cat_arr_id: cat_arr_id ? cat_arr_id : [],
+            cat_id_name: cat_id_name ? cat_id_name : "",
             good_img: fi === "-1" && p_pgNo ? p_good_img : good_img || "",
             good_name: fi === "-1" && p_pgNo ? p_good_name : good_name || "",
             total_weight: total_weight || "0",
             is_addrs: is_addrs || "0",
             is_custom: is_custom || "0",
             is_gold_price: is_gold_price || "0",
-            config: config ? [config] : [],
+            config: config ? config : [],
             specs_weight: specs_weight || "0.000",
             other_config: other_config || "",
             cost_desc: cost_desc || "",
@@ -623,8 +623,17 @@ export default {
             remark: remark || "",
             metal_id: metal_id || "",
             gold_price: gold_price || "0",
-            unit: unit ? [unit] : [],
+            unit: unit ? unit : [],
+            unit_name: unit_name ? unit_name : "",
           };
+          this.is_noble = false;
+          if (cat_arr_id && cat_arr_id.length > 0) {
+            cat_arr_id.forEach((e) => {
+              if (e === "6") {
+                this.is_noble = true;
+              }
+            });
+          }
         }
       });
     },
@@ -633,6 +642,7 @@ export default {
       console.log(e);
       const { code, pid, id, label, item } = e;
       this.ruleForm.cat_id = id ? [id] : [];
+      this.ruleForm.cat_id_name = label ? label : "";
       this.ruleForm.cat_arr_id = item;
       this.$refs.ruleForm.validateField("cat_id");
       this.is_noble = pid === "6";
@@ -640,8 +650,9 @@ export default {
 
     //单位选择
     unitsearchChange(e) {
-      const { code } = e;
+      const { code, label } = e;
       this.ruleForm.unit = code ? [code] : [];
+      this.ruleForm.unit_name = label ? label : "";
       this.$refs.ruleForm.validateField("unit");
     },
     //购买数量
@@ -651,15 +662,16 @@ export default {
     },
     //品牌选择
     brand_id_searchChange(e) {
-      const { id } = e;
+      const { id, label } = e;
       this.ruleForm.brand_id = id ? [id] : [];
+      this.ruleForm.brand_name = label ? label : "";
       this.$refs.ruleForm.validateField("brand_id");
     },
     //贵金属种类选择
     noble_metalsearchChange(e) {
       const { id, price } = e;
       this.ruleForm.metal_id = id ? id : "";
-      this.$refs.ruleForm.validateField("noble_metal");
+      this.$refs.ruleForm.validateField("metal_id");
       this.ruleForm.gold_price = price ? price : "0";
       this.$refs.ruleForm.validateField("gold_price");
     },
@@ -667,6 +679,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));
           const { total_weight, specs_weight, p_cat_info } = model;
           if (total_weight * 1000 < specs_weight * 1000) {
@@ -674,7 +691,7 @@ export default {
             this.loading = false;
             return;
           }
-          model.index = this.findex;
+          model.index = this.listindex;
           model.specinfo = JSON.parse(JSON.stringify(this.spec_tableData));
           this.loading = false;
           this.showModelThis = false;

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

@@ -311,6 +311,7 @@
                 :size="'mini'"
                 :isDetail="type === 'view'"
                 :names="brand_name"
+                :disabled="type === 'view' || type === 'edit'"
                 :placeholder="'品牌'"
                 @searchChange="brand_id_searchChange"
               />
@@ -369,7 +370,7 @@
               <search-sort
                 :value="ruleForm.cat_id"
                 :placeholder="'商品分类'"
-                :disabled="false"
+                :disabled="type === 'view' || type === 'edit'"
                 :size="'mini'"
                 :names="cat_id_name"
                 :isDetail="type === 'view' || type === 'edit'"
@@ -639,7 +640,6 @@
 <script>
 import asyncRequest from "@/apis/service/sellOut/zixunOrder";
 import resToken from "@/mixins/resToken";
-import ShowDataTableColumns from "./ShowDataTableColumns";
 import { edutRules } from "../columns";
 import baseFormAddEdit from "./baseFormAddEdit";
 export default {
@@ -685,7 +685,6 @@ export default {
         { value: "1", label: "竞品" },
         { value: "2", label: "竞聘" },
       ],
-      ShowDataTableColumns: ShowDataTableColumns,
       configOptions: ["证书", "包装盒", "绒布袋", "标签", "其他"],
       poptions: [],
       loading: false,

src/views/sellOut/zixunOrder/detail.vue

@@ -22,21 +22,23 @@
                 :newTime="newTime"
                 v-if="newTime !== '' && queryType === 'view'"
                 :sitem="sitem"
-                :columns="ShowDataTableColumns"
+                :columns="editColumns"
               >
                 <template slot="status">
-                  111
-                  <!-- <el-tag
-                    :size="'mini'"
-                    :type="sitem.status == '0' ? 'warning' : ''"
+                  <el-tag
+                    :size="tablebtnSize"
                     v-text="
-                      (
-                        statusOptions.find(
-                          (item) => item.value == sitem.status
-                        ) || {}
-                      ).label || '--'
+                      (options.find((item) => item.id == sitem.status) || {})
+                        .label || '--'
                     "
-                  ></el-tag> -->
+                  ></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
@@ -114,7 +116,7 @@ import { mapGetters } from "vuex";
 import addForm from "./components/addEditForm";
 import editForm from "./components/editForm";
 import feedbackList from "./components/feedbackList";
-import ShowDataTableColumns from "./components/ShowDataTableColumns";
+import { editColumns } from "./components/ShowDataTableColumns";
 // import grossForm from "./components/grossForm";
 // import financeExamOneForm from "./components/finance-exam-one-form";
 // import financeExamTwoForm from "./components/finance-exam-two-form";
@@ -150,7 +152,7 @@ export default {
     return {
       statusList: [],
       size: "small",
-      ShowDataTableColumns: ShowDataTableColumns,
+      editColumns: editColumns,
       projectTabs: "1",
       projectNames: ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"],
       newTime: "",
@@ -159,6 +161,16 @@ export default {
       queryId: "",
       status: "",
       sitem: null,
+      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: "招标已暂停" },
+      ],
     };
   },
   mounted() {
@@ -264,7 +276,6 @@ export default {
   width: 100%;
   box-sizing: border-box;
   .zixunOrderDetail-main {
-    overflow-y: scroll;
     position: relative;
     padding: 10px;
     height: 100%;

src/views/serviceParam/business/addEdit.vue

@@ -63,7 +63,7 @@
                 <el-form-item label="企业名称：" prop="companyName">
                   <el-input
                     v-model="ruleForm.companyName"
-                    :disabled="iisDetail == '007'"
+                   :disabled="isDetail == '007'"
                     placeholder="企业名称"
                     minlength="50"
                     ><template v-if="organName" slot="prepend">{{
@@ -82,41 +82,41 @@
                   <el-table-column
                     prop="contactor"
                     label="联系人"
-                    min-width="100"
+                    show-overflow-tooltip
                   />
                   <el-table-column
                     prop="commobile"
                     label="联系电话"
-                    min-width="100"
+                    show-overflow-tooltip
                   />
                   <el-table-column
                     prop="position"
                     label="职位"
-                    min-width="100"
+                    show-overflow-tooltip
                   />
                   <el-table-column
                     prop="comdepart"
                     label="所在部门"
-                    min-width="100"
+                    show-overflow-tooltip
                   />
                   <el-table-column
                     prop="wxaccount"
                     label="微信号"
-                    min-width="100"
+                    show-overflow-tooltip
                   />
                   <el-table-column
                     prop="qqaccount"
                     label="qq号"
-                    min-width="100"
+                    show-overflow-tooltip
                   />
-                  <el-table-column prop="email" label="邮箱" min-width="100" />
-                  <el-table-column fixed="right">
+                  <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
                         class="item"
                         effect="dark"
-                        content="添加规格类型"
+                        content="添加"
                         placement="top"
                       >
                         <i
@@ -253,14 +253,15 @@ export default {
         this.rulesThis = {};
         await this.initData();
       }
-      console.log(this.ruleForm);
       this.setOrganName();
       this.loading = false;
     },
     setOrganName() {
+      this.organName = "";
       if (this.organ && this.organ.length > 1) {
         this.organ.forEach((e) => {
           if (e.id !== "0") {
+            console.log(e.name);
             this.organName += e.name;
             this.ruleForm.pid = e.id;
           }
@@ -268,6 +269,16 @@ export default {
       } else {
         this.organName = "";
       }
+      const { companyName } = this.ruleForm;
+      let isok = companyName.indexOf(this.organName) == 0;
+      if (isok) {
+        let str = companyName;
+        this.ruleForm.companyName = str.substring(
+          this.organName.length,
+          this.ruleForm.companyName.length
+        );
+      }
+      console.log(isok);
     },
     openEdit(index, sitem) {
       this.findex = index;