Merge branch 'sit'

src/config/env.development.js

@@ -7,10 +7,10 @@ module.exports = {
     // userApi: 'http://www.invoice.com/',
     // baseApi: 'http://www.stock.com/',
 
-    // userApi: 'http://inv.test241.wanyuhengtong.com/',
-    // baseApi: 'http://stock.test241.wanyuhengtong.com/',
-    userApi: 'http://inv.sitw.wanyuhengtong.com/',
-    baseApi: 'http://stock.api.wanyuhengtong.com/',
+    userApi: 'http://inv.test241.wanyuhengtong.com/',
+    baseApi: 'http://stock.test241.wanyuhengtong.com/',
+    // userApi: 'http://inv.sitw.wanyuhengtong.com/',
+    // baseApi: 'http://stock.api.wanyuhengtong.com/',
   },
   fileURL: `https://api2.edusit.zretchome.com`,
   appId: 'wx5ac3a2c2d72b6f26',

src/views/good-share/components/showBackGood.vue

@@ -13,8 +13,18 @@
                 stripe
                 style="width: 100%"
               >
-                <el-table-column prop="pgNo" label="商品要求编码" width="160" />
-                <el-table-column prop="good_type" label="商品类型" width="80px">
+                <el-table-column
+                  prop="pgNo"
+                  label="商品要求编码"
+                  width="160"
+                  show-overflow-tooltip
+                />
+                <el-table-column
+                  prop="good_type"
+                  label="商品类型"
+                  width="80px"
+                  show-overflow-tooltip
+                >
                   <template slot-scope="scope">
                     <el-tag
                       :size="'mini'"
@@ -32,26 +42,54 @@
                   prop="budget_price"
                   label="预算单价"
                   width="110"
+                  show-overflow-tooltip
+                />
+                <el-table-column
+                  prop="num"
+                  label="购买数量"
+                  width="110"
+                  show-overflow-tooltip
                 />
-                <el-table-column prop="num" label="购买数量" width="110" />
-                <el-table-column prop="cat_name" label="商品分类" width="110" />
-                <el-table-column prop="good_img" label="图片" width="50">
+                <el-table-column
+                  prop="cat_name"
+                  label="商品分类"
+                  min-width="110"
+                  show-overflow-tooltip
+                >
                   <template slot-scope="scope">
-                    <div
+                    <span
+                      v-for="(si, sii) in scope.row.cat_info"
+                      :key="si.id + sii"
+                    >
+                      {{ sii === 0 ? "" : "_" }}{{ si.name }}
+                    </span>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="good_name"
+                  label="商品名称"
+                  min-width="150"
+                  show-overflow-tooltip
+                >
+                  <template slot-scope="scope">
+                    <img
                       v-if="scope.row.good_img"
-                      style="width: 20px; height: 20px"
-                      class="hover"
+                      class="hover fl"
                       v-viewer
-                    >
-                      <img
-                        :src="scope.row.good_img"
-                        style="display: inline-block; width: 100%; height: 100%"
-                        alt=""
-                      />
-                    </div>
+                      :src="scope.row.good_img"
+                      style="
+                        display: inline-block;
+                        width: 20px;
+                        height: 20px;
+                        margin: 2px 0 0 0;
+                      "
+                      alt=""
+                    />
+                    <span style="vertical-align: top; display: inline-block">{{
+                      scope.row.good_name
+                    }}</span>
                   </template>
                 </el-table-column>
-                <el-table-column prop="good_name" label="商品名称" />
               </el-table>
             </template>
           </div>
@@ -93,13 +131,13 @@
               </ex-table>
             </template>
           </div>
-          <div class="project-backGoodShow-title">
-           {{status==='5'||status==='6'?'已选定方案':'选择方案'}} 
-          
+          <div class="project-backGoodShow-title" v-if="total!==0">
+            {{ status === "5" || status === "6" ? "已选定方案" : "选择方案" }}
+
             <el-button-group
               :size="'mini'"
               class="fr"
-              v-if="status==='4'"
+              v-if="status === '4'"
               style="margin: 8px 0 0 0"
             >
               <el-button
@@ -141,7 +179,7 @@
                 >选定方案,并提交
               </el-button>
             </el-button-group>
-              <span v-if="plan_show" class="fr"
+            <span v-if="plan_show" class="fr"
               >方案总金额：{{ plan_show.sale_total }}元</span
             >
           </div>
@@ -245,7 +283,7 @@ export default {
     //   }
     // },
     newTime(val) {
-         this.initForm();
+      this.initForm();
     },
   },
   data() {
@@ -449,10 +487,20 @@ export default {
         model
       );
       if (code === 0) {
-        this.allPlanList = JSON.parse(JSON.stringify(data));
-        this.total = this.allPlanList.length;
+        if (data.length > 0) {
+          this.allPlanList = JSON.parse(JSON.stringify(data));
+          this.total = this.allPlanList.length;
+          this.index = 0;
+          await this.change_plan("1");
+        } else {
+        }
+        this.allPlanList = [];
+        this.total = 0;
         this.index = 0;
-        await this.change_plan("1");
+        this.plan_show = {
+          sale_total: "0",
+          feedback: [],
+        };
       } else if (code >= 100 && code <= 104) {
         await this.logout();
       } else {