Merge branch 'dev-market-20200813' of...

Merge branch 'dev-market-20200813' of 192.168.110.53:com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-market-20200813

src/views/goods/create-good.vue

@@ -155,7 +155,7 @@
               <el-form-item label="是否是处方药" prop="otc1">
                 <el-col :span="24">
                   <el-radio size="mini" v-model="formData.otc1" label="1">处方药</el-radio>
-                  <el-radio v-model="formData.otc" label="0">非处方药</el-radio>
+                  <el-radio v-model="formData.otc1" label="0">非处方药</el-radio>
                 </el-col>
               </el-form-item>
               <el-form-item label="剂型" prop="dosageId">
@@ -320,7 +320,7 @@
             </el-form-item>
             <el-form-item label="药品说明书" class="required-label">
               <el-upload
-                  v-model="formData.specification_url"
+
                   class="bg-uploader"
                   action="#"
                   :show-file-list="false"
@@ -382,7 +382,7 @@
                     <span class="sp sp-c">{{formData.goodsStock}}</span>
                     <span class="sp sp-r" @click="changeStock(2)"><i class="el-icon-plus"></i></span>
                   </div>
-                  <p class="upload-message" v-if="!isgoodStock">请上传商品头图</p>
+                 <!-- <p class="upload-message" v-if="!isgoodStock">请上传商品头图</p> -->
                  <!-- <el-input
                       size="small"
                       v-model="formData.name"
@@ -670,16 +670,34 @@
           closeLoading(this);
           if(res.data == null){
             return this.$message({
-              message: '分页数据加载失败',
+              message: '数据加载失败',
               type: 'error'
             });
           }
           const {goodsList} = res.data
-          this.formData = {...goodsList[0]}
+          this.formData = Object.assign(this.formData,{...goodsList[0]})
+          this.fileGoodsList = this.getImges(goodsList[0].goodsImgList)
+          this.fileIntrList = this.getImges(goodsList[0].medicImgList)
+          this.isMedic = this.formData.goodsType == 5 ? true : false
+          if(this.isMedic){
+            this.getLever(5,2)
+          }
+
+          console.log(this.formData)
           //this.totalRows = res.data.totalCount
         })
       },
 
+      getImges(d){
+        let a = [];
+        if(d.length > 0){
+          for(let i=0;i<d.length;i++){
+            a.push({url:d[i].goodsImgUrl,imageUrl:d[i].goodsImgUrl})
+          }
+        }
+        return a;
+      },
+
       //快速录入
       fastInput(){
         ///medications/query/{approvalnumber}
@@ -694,7 +712,7 @@
             if(res.data == null){
               return this.$message({
                 message: '未查询到数据，请手动输入',
-                type: 'error'
+                type: 'warning'
               });
             }
 
@@ -774,7 +792,7 @@
           this.formData.stock = Number(this.stock.num) + Number(this.formData.stock)
           this.formData.incrStock = this.formData.stock
         }
-
+         this.formData.goodsStock = this.formData.stock
         this.stockDio = false
       },
 
@@ -1146,6 +1164,7 @@
     }
     .sp-c{
       line-height: 30px;
+      height: 30px;
       width:92px;
       text-align: center;
       color: #666;

src/views/goods/goods-manage.vue

@@ -92,7 +92,7 @@
 
             </div>
             <div v-if="scope.row.goodsStatus == 2">
-              <!-- <el-button @click="edit(scope.row)" type="text" size="small">编辑</el-button> -->
+              <el-button @click="edit(scope.row)" type="text" size="small">编辑</el-button>
 
               <el-button @click="shelfOpt(scope.row,2)" type="text" size="small">上架销售</el-button>
               <!-- <el-button @click="shelfOpt(scope.row,3)" type="text" size="small">删除</el-button> -->