暂存

src/assets/js/btnList.js

@@ -60,6 +60,14 @@ const btnList = [
   { code: "059", name: "财务审核定价" },
   { code: "060", name: "设置毛利率" },
   { code: "061", name: "查看毛利率" },
-  
+  //
+  { code: "062", name: "添加线上商品" },
+  { code: "063", name: "分享项目" },
+  { code: "064", name: "制定项目方案" },
+  { code: "065", name: "项目下单" },
+  { code: "066", name: "招标任务停止" },
+  { code: "067", name: "招标任务启动" },
+  { code: "068", name: "发起议价" },
+
 ];
 export default btnList;

src/components/globalComponents/search-not/index.js

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

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

@@ -0,0 +1,38 @@
+<template>
+  <div class="searchNot">
+    <img :src="errGif" />
+    <div class="searchNot-placeholder" v-if="placeholder">{{ placeholder }}</div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "searchNot",
+    props: [
+    "placeholder",
+  ],
+  data() {
+    return {
+      errGif: require("@/assets/img/search-not.png") + "?" + +new Date(),
+    };
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.searchNot {
+  width: 100%;
+  box-sizing: border-box;
+  padding: 18vh 160px 0 16px;
+  text-align: center;
+  img {
+    display: inline-block;
+    width: 200px;
+    margin: 0 0 20px 0;
+  }
+  .searchNot-placeholder {
+    color: #454545;
+    font-size: 14px;
+  }
+}
+</style>

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

@@ -368,7 +368,7 @@
                 :placeholder="'定制起订量'"
                 :name="'ruleForm.moq'"
                 :min="0"
-                :disabled=" type === 'view' || type === 'editBase'"
+                :disabled="type === 'view' || type === 'editBase'"
                 :max="100000000000"
                 :position="'right'"
                 :precision="0"
@@ -386,7 +386,7 @@
                 :placeholder="'定制工期'"
                 :name="'ruleForm.customized'"
                 :min="0"
-                :disabled=" type === 'view' || type === 'editBase' "
+                :disabled="type === 'view' || type === 'editBase'"
                 :max="100000000000"
                 :position="'right'"
                 :precision="0"
@@ -1206,6 +1206,10 @@ export default {
           model.speclist = JSON.parse(JSON.stringify(this.setResData(1)));
           model.good_ladder = JSON.parse(JSON.stringify(this.setResData(2)));
           model.config = model.config.toString();
+          model.is_exclusive =
+            model.is_exclusive.length > 0
+              ? model.is_exclusive[model.is_exclusive.length - 1]
+              : "";
           let res = {};
           delete model["id"];
           if (this.type === "add") {
@@ -1378,7 +1382,7 @@ export default {
         this.ladder_tableData.push(item);
       } else {
         this.ladder_tableData.forEach((i, findex) => {
-          if (findex=== parseInt(index+"")) {
+          if (findex === parseInt(index + "")) {
             this.ladder_tableData[findex].id = id;
             this.ladder_tableData[findex].cost_fee = cost_fee;
             this.ladder_tableData[findex].delivery_fee = delivery_fee;
@@ -1494,6 +1498,7 @@ export default {
             supplierNo, //	string	供应商
             is_auth, //string	是否有销售权限0 否1 是
             auth_img, //	string	无
+            exclusive,
             is_stock, //
             after_sales, //	string	售后说明
             craft_desc, //	string	工艺说明
@@ -1552,6 +1557,12 @@ export default {
               }
             });
           }
+          let exclusiveList=[]
+          if(exclusive&&exclusive.length>0){
+            exclusive.forEach((a,ai)=>{
+              exclusiveList.push(a.id)
+            })
+          }
           this.is_noble = isok;
           this.sch_is_noble();
 
@@ -1603,7 +1614,7 @@ export default {
             tax: tax ? tax + "%" : "",
             good_name: good_name || "",
             unit: good_unit ? [good_unit] : [],
-            is_exclusive: is_exclusive || [],
+            is_exclusive: exclusiveList || [],
             noble_metal: noble_metal || "",
             is_gold_price: is_gold_price || "",
             moq: moq || "0",

src/views/purchaseIn/workbench/detail.vue

@@ -4,225 +4,236 @@
       class="page-main clear"
       v-if="powers && powers.length > 0 && powers.some((item) => item == '007')"
     >
-      <div class="left">
-        <div class="left-main">
-          <div class="left-card" v-if="sitem">
-            <div class="page-main-title">招标任务信息</div>
-            <ul class="page-main-ul clear">
-              <li>任务单号：</li>
-              <li>{{ queryId }}</li>
-              <li>截止时间：</li>
-              <li>{{ sitem.endtime }}</li>
-              <li>剩余时间：</li>
-              <li>2020-09-20 17:00:00</li>
-              <li>购买数量：</li>
-              <li>{{ sitem.num }}{{ sitem.unit_name }}</li>
-              <li>预算单价：</li>
-              <li>{{ sitem.budget_price }}元</li>
-              <li>到货时间：</li>
-              <li>{{ sitem.arrival_time }}</li>
-            </ul>
-          </div>
-          <div class="left-card" v-if="sitem">
-            <div class="page-main-title">商品要求</div>
-            <ul class="page-main-ul clear">
-              <li>商品名称：</li>
-              <li>{{ sitem.good_name }}</li>
-              <li v-if="sitem.good_img">商品图片：</li>
-              <li v-if="sitem.good_img">
-                <img
-                  v-viewer
-                  :src="sitem.good_img"
-                  class="hover"
-                  style="width: 20px; height: 20px; display: inline-block"
-                />
-              </li>
-              <li>商品分类：</li>
-              <li>{{ sitem.can_name }}</li>
-              <li>商品品牌：</li>
-              <li>{{ sitem.brand ? sitem.brand : "无要求" }}</li>
-              <li>商品规格：</li>
-              <li>
-                <el-table
-                  :data="sitem.specinfo"
-                  border
-                  stripe
-                  :size="'mini'"
-                  style="width: 100%"
-                >
-                  <el-table-column
-                    prop="spec_name"
-                    label="类型：值"
-                    show-overflow-tooltip
-                  >
-                    <template slot-scope="scope">
-                      {{ scope.row.spec_name }}：{{ scope.row.spec_value_name }}
-                    </template></el-table-column
+      <div v-if="status !== '1'">
+        <search-not :placeholder="'招标任务已结束！'" />
+      </div>
+      <div v-else>
+        <div class="left">
+          <div class="left-main">
+            <div class="left-card" v-if="sitem">
+              <div class="page-main-title">招标任务信息</div>
+              <ul class="page-main-ul clear">
+                <li>任务单号：</li>
+                <li>{{ queryId }}</li>
+                <li>截止时间：</li>
+                <li>{{ sitem.endtime }}</li>
+                <li>剩余时间：</li>
+                <li>2020-09-20 17:00:00</li>
+                <li>购买数量：</li>
+                <li>{{ sitem.num }}{{ sitem.unit_name }}</li>
+                <li>预算单价：</li>
+                <li>{{ sitem.budget_price }}元</li>
+                <li>到货时间：</li>
+                <li>{{ sitem.arrival_time }}</li>
+              </ul>
+            </div>
+            <div class="left-card" v-if="sitem">
+              <div class="page-main-title">商品要求</div>
+              <ul class="page-main-ul clear">
+                <li>商品名称：</li>
+                <li>{{ sitem.good_name }}</li>
+                <li v-if="sitem.good_img">商品图片：</li>
+                <li v-if="sitem.good_img">
+                  <img
+                    v-viewer
+                    :src="sitem.good_img"
+                    class="hover"
+                    style="width: 20px; height: 20px; display: inline-block"
+                  />
+                </li>
+                <li>商品分类：</li>
+                <li>{{ sitem.can_name }}</li>
+                <li>商品品牌：</li>
+                <li>{{ sitem.brand ? sitem.brand : "无要求" }}</li>
+                <li>商品规格：</li>
+                <li>
+                  <el-table
+                    :data="sitem.specinfo"
+                    border
+                    stripe
+                    :size="'mini'"
+                    style="width: 100%"
                   >
-                </el-table>
-              </li>
-              <li>总重量：</li>
-              <li>{{ sitem.total_weight }}g</li>
-              <li>是否多地：</li>
-              <li>{{ sitem.is_addrs === "1" ? "多地" : "一地" }}</li>
-              <li>是否定制：</li>
-              <li>{{ sitem.is_custom === "1" ? "定制" : "非定制" }}</li>
+                    <el-table-column
+                      prop="spec_name"
+                      label="类型：值"
+                      show-overflow-tooltip
+                    >
+                      <template slot-scope="scope">
+                        {{ scope.row.spec_name }}：{{
+                          scope.row.spec_value_name
+                        }}
+                      </template></el-table-column
+                    >
+                  </el-table>
+                </li>
+                <li>总重量：</li>
+                <li>{{ sitem.total_weight }}g</li>
+                <li>是否多地：</li>
+                <li>{{ sitem.is_addrs === "1" ? "多地" : "一地" }}</li>
+                <li>是否定制：</li>
+                <li>{{ sitem.is_custom === "1" ? "定制" : "非定制" }}</li>
 
-              <li v-if="sitem.is_metal">启用金价：</li>
-              <li v-if="sitem.is_metal">
-                {{ sitem.is_gold_price === "1" ? "启用" : "不启用" }}
-              </li>
-              <li v-if="sitem.is_metal">配置要求：</li>
-              <li v-if="sitem.is_metal">{{ sitem.config }}</li>
+                <li v-if="sitem.is_metal">启用金价：</li>
+                <li v-if="sitem.is_metal">
+                  {{ sitem.is_gold_price === "1" ? "启用" : "不启用" }}
+                </li>
+                <li v-if="sitem.is_metal">配置要求：</li>
+                <li v-if="sitem.is_metal">{{ sitem.config }}</li>
 
-              <li v-if="sitem.is_metal">金属克重：</li>
-              <li v-if="sitem.is_metal">{{ sitem.specs_weight }}g</li>
-              <li v-if="sitem.is_metal">其他要求：</li>
-              <li v-if="sitem.is_metal">
-                {{ sitem.other_config }}
-              </li>
-              <li v-if="sitem.is_metal">金属种类：</li>
-              <li v-if="sitem.is_metal">
-                {{ sitem.metal_name }}
-              </li>
+                <li v-if="sitem.is_metal">金属克重：</li>
+                <li v-if="sitem.is_metal">{{ sitem.specs_weight }}g</li>
+                <li v-if="sitem.is_metal">其他要求：</li>
+                <li v-if="sitem.is_metal">
+                  {{ sitem.other_config }}
+                </li>
+                <li v-if="sitem.is_metal">金属种类：</li>
+                <li v-if="sitem.is_metal">
+                  {{ sitem.metal_name }}
+                </li>
 
-              <li>工艺说明：</li>
-              <li>{{ sitem.cost_desc }}</li>
-              <li>产品用途：</li>
-              <li>{{ sitem.use_desc }}</li>
-              <li>商品备注：</li>
-              <li>{{ sitem.remark }}</li>
-            </ul>
+                <li>工艺说明：</li>
+                <li>{{ sitem.cost_desc }}</li>
+                <li>产品用途：</li>
+                <li>{{ sitem.use_desc }}</li>
+                <li>商品备注：</li>
+                <li>{{ sitem.remark }}</li>
+              </ul>
+            </div>
           </div>
         </div>
-      </div>
-      <div class="p-right">
-        <div
-          v-if="editType == '' || editType == 'wait'"
-          class="right-mian-wait"
-        >
-          <div class="title">采返工作台</div>
-          <div class="main">暂无工作数据！</div>
-        </div>
-        <template v-else>
-          <base-form
-            :id="queryId"
-            :editId="editId"
-            :type="editType"
-            :askItem="sitem"
-            :sitem="baseSitem"
-            :newTime="newTime"
-            @refresh="(editType = 'wait'), searchList()"
-            @cancel="editType = 'wait'"
-            v-if="newTime !== ''"
-          />
-        </template>
-      </div>
-      <div class="bottom">
-        <el-table
-          :data="tableData"
-          border
-          stripe
-          :size="'mini'"
-          style="width: 100%"
-        >
-          <el-table-column
-            prop="good_img"
-            label="图片"
-            width="48"
-            show-overflow-tooltip
-          >
-            <template slot-scope="scope">
-              <div
-                v-if="scope.row.good_img"
-                style="width: 20px; height: 20px"
-                class="hover"
-                v-viewer
-              >
-                <img
-                  :src="scope.row.good_img"
-                  style="display: inline-block; width: 100%; height: 100%"
-                  alt=""
-                />
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="good_name"
-            label="商品名称"
-            min-width="120"
-            show-overflow-tooltip
-          />
-          <el-table-column
-            prop="sale_price"
-            label="成本合计"
-            width="110"
-            show-overflow-tooltip
-          />
-          <el-table-column
-            prop="specinfo"
-            label="规格"
-            width="100"
-            show-overflow-tooltip
+        <div class="p-right">
+          <div
+            v-if="editType == '' || editType == 'wait'"
+            class="right-mian-wait"
           >
-            <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
+            <div class="title">采返工作台</div>
+            <div class="main">暂无工作数据！</div>
+          </div>
+          <template v-else>
+            <base-form
+              :id="queryId"
+              :editId="editId"
+              :type="editType"
+              :askItem="sitem"
+              :sitem="baseSitem"
+              :newTime="newTime"
+              @refresh="(editType = 'wait'), searchList()"
+              @cancel="editType = 'wait'"
+              v-if="newTime !== ''"
+            />
+          </template>
+        </div>
+        <div class="bottom">
+          <el-table
+            :data="tableData"
+            border
+            stripe
+            :size="'mini'"
+            style="width: 100%"
           >
+            <el-table-column
+              prop="good_img"
+              label="图片"
+              width="48"
+              show-overflow-tooltip
+            >
+              <template slot-scope="scope">
+                <div
+                  v-if="scope.row.good_img"
+                  style="width: 20px; height: 20px"
+                  class="hover"
+                  v-viewer
+                >
+                  <img
+                    :src="scope.row.good_img"
+                    style="display: inline-block; width: 100%; height: 100%"
+                    alt=""
+                  />
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="good_name"
+              label="商品名称"
+              min-width="120"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              prop="sale_price"
+              label="成本合计"
+              width="110"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              prop="specinfo"
+              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="单位"
-            width="45"
-            show-overflow-tooltip
-          />
-          <el-table-column
-            prop="brand_name"
-            label="品牌"
-            width="80"
-            show-overflow-tooltip
-          />
+            <el-table-column
+              prop="unit"
+              label="单位"
+              width="45"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              prop="brand_name"
+              label="品牌"
+              width="80"
+              show-overflow-tooltip
+            />
 
-          <el-table-column
-            prop="supplierName"
-            label="供应商"
-            show-overflow-tooltip
-          />
-          <el-table-column fixed="right" label="操作" width="80">
-            <template slot="header" slot-scope="scope">
-              <span>操作</span>
-              <el-tooltip effect="dark" content="添加反馈商品" placement="top">
-                <i
-                  class="el-icon-circle-plus-outline tb-icon fr"
-                  @click="openModal('add', 'add')"
-                ></i>
-              </el-tooltip>
-            </template>
-            <template slot-scope="scope">
-              <el-tooltip
-                v-if="powers.some((item) => item == '007')"
-                effect="dark"
-                content="详情"
-                placement="top"
-              >
-                <i
-                  class="el-icon-view tb-icon"
-                  @click="openModal(scope.row.bidNo, 'view')"
-                ></i>
-              </el-tooltip>
-              <el-tooltip effect="dark" content="修改" placement="top">
-                <i
-                  class="el-icon-edit tb-icon"
-                  @click="openModal(scope.row.bidNo, 'edit')"
-                ></i>
-              </el-tooltip>
-            </template>
-          </el-table-column>
-        </el-table>
+            <el-table-column
+              prop="supplierName"
+              label="供应商"
+              show-overflow-tooltip
+            />
+            <el-table-column fixed="right" label="操作" width="80">
+              <template slot="header" slot-scope="scope">
+                <span>操作</span>
+                <el-tooltip
+                  effect="dark"
+                  content="添加反馈商品"
+                  placement="top"
+                >
+                  <i
+                    class="el-icon-circle-plus-outline tb-icon fr"
+                    @click="openModal('add', 'add')"
+                  ></i>
+                </el-tooltip>
+              </template>
+              <template slot-scope="scope">
+                <el-tooltip
+                  v-if="powers.some((item) => item == '007')"
+                  effect="dark"
+                  content="详情"
+                  placement="top"
+                >
+                  <i
+                    class="el-icon-view tb-icon"
+                    @click="openModal(scope.row.bidNo, 'view')"
+                  ></i>
+                </el-tooltip>
+                <el-tooltip effect="dark" content="修改" placement="top">
+                  <i
+                    class="el-icon-edit tb-icon"
+                    @click="openModal(scope.row.bidNo, 'edit')"
+                  ></i>
+                </el-tooltip>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
       </div>
     </div>
     <div v-else>
@@ -265,6 +276,7 @@ export default {
       isDetail: false,
       modelId: 0,
       queryId: "",
+      status: "",
       sitem: {},
       newTime: "",
       editId: "add",
@@ -303,7 +315,6 @@ export default {
         infoNo: this.queryId,
       });
       this.loading = false;
-      console.log(data);
       if (code === 0) {
         this.sitem = JSON.parse(JSON.stringify(data));
         const { status, can } = this.sitem;
@@ -326,7 +337,6 @@ export default {
           this.sitem.can_id_arr = [];
           this.sitem.can_name = "";
         }
-        // console.log(this.sitem.can_id_arr);
         this.status = status;
         this.getNewTime();
       } else if (code >= 100 && code <= 104) {

src/views/purchaseIn/workbench/index.vue

@@ -26,7 +26,7 @@
           <div class="taskList">
             <div
               class="aaa"
-              v-for="item in list"
+              v-for="item in list1"
               :key="item"
               @click="routeGoto('workbenchDetail', { id: 'INF2203151428199103' })"
             >
@@ -81,6 +81,7 @@ export default {
       showModel: false,
       modelId: "000",
       sitem: {},
+      list1:[],
       list: [
         1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
         21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38,

src/views/sellOut/project/detail.vue

@@ -4,6 +4,22 @@
       class="projectDetail-main"
       v-if="powers && powers.length > 0 && powers.some((item) => item == '007')"
     >
+      <div class="share-a">
+        <el-tooltip
+          v-if="powers.some((item) => item == '007')"
+          effect="dark"
+          content="分享项目"
+          placement="top"
+        >
+          <el-button
+            @click="copyToClip('good-share')"
+            type="primary"
+            :size="'mini'"
+            icon="el-icon-position"
+            circle
+          ></el-button>
+        </el-tooltip>
+      </div>
       <el-tabs v-model="projectTabs">
         <el-tab-pane label="新建项目" name="0" v-if="queryType === 'add'">
           <add-form
@@ -18,22 +34,6 @@
         <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">
-              <div>
-                <el-button
-                  @click="copyToClip('good-share')"
-                  type="danger"
-                  :size="'mini'"
-                  icon="el-icon-position"
-                  circle
-                ></el-button>
-                <el-button
-                  @click="copyToClip('purchaseIn/workbenchDetail')"
-                  type="danger"
-                  :size="'mini'"
-                  icon="el-icon-position"
-                  circle
-                ></el-button>
-              </div>
               <add-form
                 v-if="newTime !== ''"
                 :newTime="newTime"
@@ -201,7 +201,6 @@ export default {
     },
     copyToClip(title) {
       const { host } = window.location;
-      //
       let url = `${host}/#/${title}?id=${this.queryId}`;
       let aux = document.createElement("input");
       aux.setAttribute("value", url);
@@ -256,6 +255,11 @@ export default {
     padding: 10px;
     height: 100%;
     width: 100%;
+    .share-a {
+      position: absolute;
+      top: 10px;
+      right: 16px;
+    }
   }
   .projectDetail-title {
     border-top: 1px solid #ebeef5;