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

@@ -351,11 +351,11 @@
           <div class="basic-item-icon">
             <div class="part-tit">销售信息</div>
             <div class="inline">
-              <el-form-item label="零售价" prop="costPrice">
+              <el-form-item label="零售价" prop="optPrice">
                 <el-col :span="20">
                   <el-input
                       size="small"
-                      v-model="formData.costPrice"
+                      v-model="formData.optPrice"
                       placeholder="请输入零售价"
 
                   ></el-input>
@@ -407,23 +407,7 @@
             </div>
           </div>
         </el-form>
-      <el-dialog
-          class="dialog-title-border-old"
-          title="图片裁剪"
-          :visible.sync="showCropper"
-          :width="currentOption.cropDialogWidth"
-          center>
-        <div slot="title" style="text-align: left;">
-          <span style="font-weight: 700;">图片裁剪</span>
-        </div>
-        <div v-if="showCropper" style="margin-bottom: 20px;">
-          <Cropper
-              :cropOption="currentOption"
-              @getCropImg="getCropImg(arguments)"
-              :originImg="slide2.oriUrl"
-          />
-        </div>
-      </el-dialog>
+
       <el-dialog
         :title="stock.title"
         :visible.sync="stockDio"
@@ -451,7 +435,7 @@
   let vm = null;
   import { openLoading, closeLoading } from "../../utils/utils";
   import { doUpload, getFilePath } from "../../utils/qiniu-util";
-  import { updateGoods ,updateStock,dosageAll,getDeparts} from '@/utils/goods';
+  import { updateGoods ,updateStock,dosageAll,getDeparts,getGoodsList} from '@/utils/goods';
   import Cropper from '@/components/common/cropper.vue'
   import { mapGetters } from "vuex";
   export default {
@@ -515,6 +499,7 @@
           value: '3',
         }],
         formData: {
+          optPrice:0,
           id:'',
           categoryId:'',
           categoryIdLevel2: '',
@@ -531,7 +516,7 @@
           dosageId:null,
           usage:'',
           otc:false,
-          otc1:'',
+          otc1:'1',
           approvalNumber:'',
           manufacturer:'',
           department:'',
@@ -629,7 +614,7 @@
           // barCode: [
           //   { required: true, message: "请输入条形码", trigger: "blur" },
           // ],
-          costPrice: [
+          optPrice: [
             { required: true, message: "请输入零售价", trigger: "blur" },
           ],
           dynamicFlag: [
@@ -657,13 +642,43 @@
         this.allDeparts = res.data
       })
       if(id != 'add'){
-        let goods = Object.assign(this.goodsInfo,{})
-        this.formData = {...goods}
-        console.log(goods)
+        // let goods = Object.assign(this.goodsInfo,{})
+        // this.formData = {...goods}
+        // console.log(goods)
+        this.getDetailByEdit(id)
       }
 
     },
     methods: {
+
+      //eidt状态
+      getDetailByEdit(id){
+        let parm = {
+          goodsIdList:[id],
+          goodsName	:'',
+          goodsType	:'',
+          pageNo:1,
+          pageSize:	10,
+        }
+        getGoodsList(parm).then((res)=>{
+          if(res.code != '000000'){
+            return this.$message({
+              message: res.message,
+              type: 'error'
+            });
+          }
+          closeLoading(this);
+          if(res.data == null){
+            return this.$message({
+              message: '分页数据加载失败',
+              type: 'error'
+            });
+          }
+          const {goodsList} = res.data
+          this.formData = {...goodsList[0]}
+          //this.totalRows = res.data.totalCount
+        })
+      },
       getGoodsTypes(id,type){
         if(id == 5 ){
           this.isMedic = true;
@@ -791,7 +806,8 @@
       //更新商品
       updateGoodsInfo(){
 
-        this.formData.incrStock = 1000
+        //this.formData.incrStock = 1000
+        this.formData.costPrice = this.formData.optPrice*100
         updateGoods(this.formData).then((res)=>{
           if (res.code !== '000000') {
             return this.$message.error(res.message);

src/views/goods/goods-manage.vue

@@ -10,7 +10,7 @@
               <el-input v-model="searchForm.goodsName" size="small" placeholder="请输入商品名称"></el-input>
             </el-form-item>
             <el-form-item label="商品ID">
-              <el-input v-model="searchForm.id" size="small" placeholder="请输入商品ID"></el-input>
+              <el-input v-model="id" size="small" placeholder="请输入商品ID"></el-input>
             </el-form-item>
             <el-form-item label="商品类型">
               <el-select
@@ -189,6 +189,7 @@
         showAllFlag: false,
         showNewFlag: false,
         batchDialog:false,
+        id:'',
         searchForm: {
           goodsIdList:[],
           goodsName	:'',
@@ -317,7 +318,7 @@
         if(row == 'add'){
           url = `/create-good?id=add`
         }else{
-          url = `/create-good?id=${row.id}`
+          url = `/create-good?id=${row.goodsId}`
         }
         this.$store.dispatch('goodsManage/changeGoodsInfo', {...row});
         this.$router.push({
@@ -398,7 +399,9 @@
 
       searchList() {
         openLoading(this);
-
+        if(this.id != ''){
+          this.searchForm.goodsIdList = [this.id]
+        }
         this.searchForm.pageNo = 1
         this.getLists()
       },