Kaynağa Gözat

Merge branch 'sit'

戴艳蓉 3 yıl önce
ebeveyn
işleme
20614af515

Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
dist/index.html


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
dist/static/css/chunk-0ac6b02e.180dacf1.css


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
dist/static/css/chunk-49501fc6.d9ebfb47.css


BIN
dist/static/css/chunk-3431cb8f.ce2236ae.css.gz → dist/static/css/chunk-49501fc6.d9ebfb47.css.gz


BIN
dist/static/js/app.14e5d940.js.gz


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
dist/static/js/app.e6bd6a0d.js


BIN
dist/static/js/app.e6bd6a0d.js.gz


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
dist/static/js/chunk-0ac6b02e.0d42da35.js


BIN
dist/static/js/chunk-0ac6b02e.0d42da35.js.gz


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
dist/static/js/chunk-3431cb8f.1a82a1be.js


BIN
dist/static/js/chunk-3431cb8f.1a82a1be.js.gz


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
dist/static/js/chunk-49501fc6.ae880883.js


BIN
dist/static/js/chunk-49501fc6.ae880883.js.gz


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
dist/static/js/chunk-aeeff378.a4fdcfdf.js


BIN
dist/static/js/chunk-aeeff378.a4fdcfdf.js.gz


+ 6 - 0
src/views/good-share/components/columnsForm.js

@@ -1,10 +1,16 @@
 export default [
     // { type: "selection", fixed: "left", _noset_: true },
+    {
+        prop: "pgNo",
+        label: "商品要求编码",
+        width: '170px'
+    },
     {
         prop: "spuCode",
         label: "商品编号",
         width: '170px'
     },
+
     {
         prop: "good_img",
         label: "图片",

+ 149 - 5
src/views/good-share/components/showBackGood.vue

@@ -1,8 +1,6 @@
 <template>
   <div class="showbackgood">
-    <div
-      class="slist-card"
-    >
+    <div class="slist-card">
       <div class="project-backGoodShow" v-loading="loading">
         <div class="project-backGoodShow-main">
           <div class="project-backGoodShow-title">商品要求</div>
@@ -15,6 +13,7 @@
                 stripe
                 style="width: 100%"
               >
+                <el-table-column prop="pgNo" label="商品要求编码" width="180" />
                 <el-table-column prop="good_type" label="商品类型" width="80px">
                   <template slot-scope="scope">
                     <el-tag
@@ -80,6 +79,115 @@
               </ex-table>
             </template>
           </div>
+          <div class="project-backGoodShow-title">
+            选择方案
+            <el-button-group
+              :size="'mini'"
+              class="fr"
+              v-if="table_type === 'list'"
+              style="margin: 8px 0 0 0"
+            >
+              <el-button
+                class="fr"
+                type="primary"
+                :size="'mini'"
+                v-if="index !== 0 && total !== 0"
+                icon="el-icon-arrow-left"
+                @click="index--, change_plan()"
+              ></el-button>
+              <el-button
+                type="primary"
+                class="fr"
+                v-if="total !== 0"
+                :size="'mini'"
+                style="height: 29px"
+                >方案共{{ index + 1 }}/{{ total }}</el-button
+              >
+              <el-button
+                type="primary"
+                class="fr"
+                v-if="index + 1 !== total && total !== 0"
+                @click="index++, change_plan()"
+                :size="'mini'"
+                ><i
+                  class="el-icon-arrow-right el-icon--right"
+                  :size="'mini'"
+                ></i
+              ></el-button>
+            </el-button-group>
+          </div>
+          <div class="project-backGoodShow-ask-table">
+            <template v-if="plan_table">
+              <el-table
+                :data="plan_table"
+                :size="'mini'"
+                border
+                stripe
+                style="width: 100%"
+              >
+                <el-table-column prop="pgNo" label="商品要求编码" width="180" />
+                <el-table-column prop="good_type" label="商品类型" width="80px">
+                  <template slot-scope="scope">
+                    <el-tag
+                      :size="'mini'"
+                      v-text="
+                        (
+                          statusOptions.find(
+                            (items) => items.value == scope.row.good_type
+                          ) || {}
+                        ).label || '--'
+                      "
+                    ></el-tag
+                  ></template>
+                </el-table-column>
+                <el-table-column
+                  prop="budget_price"
+                  label="预算单价"
+                  width="110"
+                />
+                <el-table-column prop="num" label="购买数量" width="110" />
+                <el-table-column prop="cat_name" label="商品分类" />
+                <el-table-column prop="good_img" label="图片" width="50">
+                  <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="商品名称" />
+              </el-table>
+            </template>
+            <div class="table-change-footer" v-if="total !== 0">
+              <span>项目总金额:{{ total }}元</span>
+              <el-button-group
+                :size="'mini'"
+                class="fr"
+                style="margin: 8px 0 0 0"
+              >
+                <el-button
+                  type="primary"
+                  class="fr"
+                  v-if="index + 1 !== total && total !== 0"
+                  @click="index++, change_plan()"
+                  :size="'mini'"
+                  >选中该方案
+                  <i
+                    class="el-icon-arrow-right el-icon--right"
+                    :size="'mini'"
+                  ></i
+                ></el-button>
+              </el-button-group>
+            </div>
+          </div>
         </div>
       </div>
     </div>
@@ -109,13 +217,16 @@ export default {
   data() {
     return {
       loading: false,
+      allPlanList: [],
+      index: 0,
+      total: 0,
       pageInfo: {
         size: 15,
         curr: 1,
         total: 0,
       },
       ladder: [],
-
+      plan_table: [],
       tableData: [],
       projectNo: "",
       status: "",
@@ -148,7 +259,7 @@ export default {
       this.loading = true;
       this.tableData = [];
       await this.initListData();
-      console.log(this.allList);
+      // console.log(this.allList);
       this.loading = false;
       // console.log(this.allList);
     },
@@ -210,6 +321,39 @@ export default {
       }
       this.loading = false;
     },
+    //获取全部方案
+    async get_plan() {
+      if (!this.loading) {
+        this.loading = true;
+        let model = {
+          projectNo: this.projectNo,
+        };
+        const { code, data } = await asyncRequest.pet_project_plan(model);
+        if (code === 0) {
+          const { plan } = data;
+          this.allPlanList = JSON.parse(JSON.stringify(plan));
+          this.total = this.allPlanList.length;
+          this.index = 0;
+          await this.change_plan();
+        } else if (code >= 100 && code <= 104) {
+          await this.logout();
+        } else {
+          this.$message.warning(res.message);
+        }
+        this.loading = false;
+      }
+    },
+    //切换当前展示的方案
+    async change_plan() {
+      // this.table_type = "list";
+      // if (type) {
+      //   this.index = 0;
+      // }
+
+      this.plan_tableData = JSON.parse(
+        JSON.stringify(this.allPlanList[this.index])
+      );
+    },
   },
 };
 </script>

+ 6 - 5
src/views/sellOut/project/components/setPlan.vue

@@ -220,19 +220,20 @@
             show-overflow-tooltip
           />
           <el-table-column
-            prop="sale_price"
+            prop="sale_prices"
             label="销售单价"
             width="110"
             show-overflow-tooltip
           >
             <template slot-scope="scope">
               <digital-input
-                :values="scope.row.sale_price"
-                :placeholder="'起订量'"
+                :values="scope.row.sale_prices"
+                :placeholder="'销售单价'"
                 :min="0"
                 :max="100000000000"
                 :position="'right'"
                 :precision="0"
+                :size="'mini'"
                 :controls="false"
                 :append="''"
                 @reschange="moq_num_change($event, scope.$index)"
@@ -376,7 +377,7 @@ export default {
       this.table_type = "add";
     },
     moq_num_change(e, index) {
-      this.plan_tableData[index].sale_pricee = e + "";
+      this.plan_tableData[index].sale_pricees = e + "";
       this.$set(this.plan_tableData, index, this.plan_tableData[index]);
     },
     //初始化整个组件
@@ -505,7 +506,7 @@ export default {
         let model = {
           projectNo: this.projectNo,
         };
-        const { code, data } = await asyncRequest.pget_project_plan(model);
+        const { code, data } = await asyncRequest.get_project_plan(model);
         if (code === 0) {
           const { plan } = data;
           this.allPlanList = JSON.parse(JSON.stringify(plan));

+ 2 - 2
src/views/sellOut/project/detail.vue

@@ -39,7 +39,7 @@
             </el-collapse-item>
           </el-collapse>
         </el-tab-pane>
-        <el-tab-pane label="商品反馈详情" name="2" v-if="queryType !== 'add'">
+        <!-- <el-tab-pane label="商品反馈详情" name="2" v-if="queryType !== 'add'">
           <back-good-show
             :id="queryId"
             v-if="newTime !== ''"
@@ -48,7 +48,7 @@
             :sitem="sitem"
             @refresh="initForm()"
           />
-        </el-tab-pane>
+        </el-tab-pane> -->
         <el-tab-pane label="方案制作" name="3" v-if="queryType !== 'add'">
           <set-plan
             :id="queryId"

+ 1 - 1
src/views/serviceParam/supplier/components/baseForm.vue

@@ -544,7 +544,7 @@ export default {
           { required: true, validator: validatemobile, trigger: "blur" },
         ],
         telephone: [
-          { required: true, validator: validatetelephone, trigger: "blur" },
+          { required: false, validator: validatetelephone, trigger: "blur" },
         ],
         position: [
           { required: true, message: "职位不能为空", trigger: "blur" },

Bu fark içinde çok fazla dosya değişikliği olduğu için bazı dosyalar gösterilmiyor