Merge branch 'main' of https://code.tiantongsl.com/bin/shop-many-admin-ui

src/views/product/productExamine/index.vue

@@ -138,7 +138,11 @@
         <el-table-column prop="price" label="商品售价" min-width="80" />
         <el-table-column prop="sales" label="销量" min-width="70" />
         <el-table-column prop="stock" label="库存" min-width="70" />
-        <el-table-column prop="is_audited" label="待审核类型" min-width="80" />
+        <el-table-column prop="is_audited" label="待审核类型" min-width="80">
+          <template slot-scope="scope">
+            {{scope.row.is_audited?'上架商品修改':'首次提报'}}
+          </template>
+        </el-table-column>
         <el-table-column label="推荐级别" min-width="150">
           <template slot-scope="scope">
             <el-rate disabled v-model="scope.row.star" :colors="colors">

src/views/product/productExamine/info.vue

@@ -8,6 +8,23 @@
     :before-close="handleClose"
     class="projectInfo"
   >
+    <div class="acea-row">
+      <span class="sp">店铺名称：{{ projectData.merchant&&projectData.merchant.mer_name }}</span>
+          <span class="sp">入住企业名称：</span>
+          <span class="sp">店铺联系人: {{ projectData.merchant&&projectData.merchant.service_phone }}</span>
+          <span class="sp">
+            营业执照：
+            <div class="demo-image__preview">
+              <el-image
+                style="width: 60px; height: 60px"
+                :src="projectData.image"
+                :preview-src-list="[projectData.image]"
+              />
+            </div>
+          </span>
+          <span class="sp">联系人电话：{{ projectData.unit_name }}</span>
+
+    </div>
     <el-tabs v-if="projectData && isShow" v-model="activeNames" v-loading="loading">
       <el-tab-pane label="商品信息" name="first">
         <div class="acea-row">
@@ -59,12 +76,12 @@
       </el-tab-pane>
       <el-tab-pane label="资质信息" name="aptitude">
         <span class="sp">商品名称：
-          <el-radio-group v-model="aptitude">
+          <el-radio-group v-model="qualification.commodity_type">
-            <el-radio :label="0" class="radio">国产</el-radio>
+            <el-radio :label="0" class="radio" :disabled="qualification.commodity_type==1">国产</el-radio>
-            <el-radio :label="1">进口</el-radio>
+            <el-radio :label="1" :disabled="qualification.commodity_type==0">进口</el-radio>
           </el-radio-group>
         </span>
-      <div v-if="aptitude == 0">
+      <div v-if="qualification.commodity_type == 0">
         <span class="sp">生产企业名称：{{ qualification.production_name }}</span>
         <span class="upload">
           <div class="upload_left">生产营业执照：</div>
@@ -157,7 +174,7 @@
           </div>
         </span>
       </div>
-      <div v-if="aptitude == 1">
+      <div v-if="qualification.commodity_type == 1">
         <span class="sp">进口/企业境内总代企业名称: {{ qualification.import_name }}</span>
         <span class="upload">
           <div class="upload_left">生产营业执照：</div>
@@ -343,22 +360,6 @@
           </template>
         </span>
       </el-tab-pane>
-      <el-tab-pane label="店铺信息" name="shop">
-        <span class="sp">店铺名称：{{ projectData.merchant&&projectData.merchant.mer_name }}</span>
-          <span class="sp">入住企业名称：</span>
-          <span class="sp100">
-            营业执照：
-            <div class="demo-image__preview">
-              <el-image
-                style="width: 60px; height: 60px"
-                :src="projectData.image"
-                :preview-src-list="[projectData.image]"
-              />
-            </div>
-          </span>
-          <span class="sp">店铺联系人: {{ projectData.merchant&&projectData.merchant.service_phone }}</span>
-          <span class="sp">联系人电话：{{ projectData.unit_name }}</span>
-    </el-tab-pane>
     </el-tabs>
     <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="80px" class="demo-ruleForm">
       <el-form-item label="审核状态" prop="status">
@@ -548,7 +549,7 @@ export default {
         return suffix == 'pdf'
       },
        // 点击商品图
-       modalPicTap(tit, num, i) {
+      modalPicTap(tit, num, i) {
       const _this = this;
       const attr = [];
       this.$modalUpload(function(img) {
@@ -576,9 +577,27 @@ export default {
     getInfo(id) {
       this.proId = id
       this.loading = true
+      this.ruleForm.status_img = ''
       productDetailApi(id).then(res => {
         this.projectData = res.data
-        this.qualification = res.data.qualification
+        let qualification={
+          production_name: '',
+          businessList: [],
+          licenceList: [],
+          trademarkList: [],
+          authorizedList: [],
+          commodityList: [],
+          otherList: [],
+          importBusinessList: [],
+          importAuthorizedList: [],
+          customsList: [],
+          packingList: [],
+          importOtherList: [],
+          commodity_type: 0,
+          brands_name: '',
+          import_name: ''
+      }
+        this.qualification = res.data.qualification || qualification
         this.svip_type = res.data.svip_price_type
        
         if (this.projectData.spec_type === 0) {
@@ -676,6 +695,7 @@ export default {
     position: relative;
     cursor: pointer;
     display: inline-block;
+    vertical-align: middle;
     img {
       width: 100%;
       height: 100%;