新增编辑商品

src/api/pages/mst/goods.js

@@ -6,7 +6,6 @@
 export default {
   goodsService:{
     prefix: '/mdm-server/mst/goodsSku/',
-
   }
 }
 

src/locale/lang/zh-CN.js

@@ -105,8 +105,6 @@ export const button = {
   addNsc:'新建批号调整',
   intoEnter:'转入库',
   purchaseReturn:'采购退货',
-  transferPrice:'调整单价',
-  transferAmt:'调整金额',
 }
 
 /**
@@ -547,7 +545,11 @@ export const columns = {
   subUnit:'辅助单位',
   priceItem:'价格信息',
   priceWholesale:'批发价',
-  priceLimited:'销售限价'
+  priceLimited:'销售限价',
+  transferPrice:'调整单价',
+  transferAmt:'调整金额',
+  invInto:'存货信息',
+  skuImages:'商品图片',
 }
 
 /**

src/view/ivt/ivt-check/form.vue

@@ -307,7 +307,6 @@ export default {
       {
         return false;
       }
-
     },
 
     /**

src/view/mst/goods/form.vue

@@ -8,58 +8,58 @@
                   @pageChange="editPageChange"></DkPageButton>
     <DkCollapse @on-change="changeCollapse" ref="collapse">
       <DkPanel prop="baseAttribute">
-        <!--  下拉区域  -->
-        <DkForm slot="content" ref="formInline" v-model="formData"  :labelMaxWords=5>
-          <!--唯一编码-->
+        <!--  基础属性  -->
+        <DkForm slot="content" ref="formInline" v-model="formData" :labelMaxWords=5>
+          <!--商品编码-->
           <DkFormItem prop="skuCode">
             <InputPop ref="skuCode" v-model="formData.skuCode" :readonly="true"/>
           </DkFormItem>
           <!--商品型号-->
-          <DkFormItem prop="skuModel">
+          <DkFormItem prop="skuModel" :required="true">
             <InputPop ref="skuModel" v-model="formData.skuModel" />
           </DkFormItem>
           <!--商品名称-->
-          <DkFormItem prop="skuName">
+          <DkFormItem prop="skuName" :required="true">
             <InputPop ref="skuName" v-model="formData.skuName"/>
           </DkFormItem>
         </DkForm>
       </DkPanel>
       <DkPanel prop="goodsAttribute">
-        <!--  下拉区域  -->
+        <!--  商品属性  -->
         <DkForm slot="content" ref="formInline" v-model="formData" :labelMaxWords=5>
           <!--  品牌  -->
-          <DkFormItem prop="brandIds">
+          <DkFormItem prop="brandId" :label="$t('brandIds')" :required="true">
             <SelectMagnifier v-model="formData.brandId" :display-text="formData.brandName"
                              :type="this.$config.MagnifierType.brand"
                              :multiple="false"></SelectMagnifier>
           </DkFormItem>
           <!--商品种类-->
-          <DkFormItem prop="category">
-            <SelectPop v-model="formData.category" :multiple="false"
-                       :options="categoryList" ref="category"
+          <DkFormItem prop="categoryId" :label="$t('category')" :required="true">
+            <SelectPop v-model="formData.categoryId" :multiple="false"
+                       :options="categoryList"
                        labelKey="catName"
                        valueKey=catId>
             </SelectPop>
           </DkFormItem>
           <!--商品系列-->
-          <DkFormItem prop="series" >
-            <SelectPop v-model="formData.seriesId" :multiple="false" :options="seriesList" ref="category"
+          <DkFormItem prop="seriesId" :label="$t('series')" :required="true">
+            <SelectPop v-model="formData.seriesId" :multiple="false" :options="seriesList"
                        labelKey="seriesName"
                        valueKey=seriesId>
             </SelectPop>
           </DkFormItem>
           <!--计量单位-->
-          <DkFormItem prop="unit">
-            <SelectPop v-model="formData.unitId" :multiple="false" :options="unitList" ref="unit"
+          <DkFormItem prop="unitId" :label="$t('unit')" :required="true">
+            <SelectPop v-model="formData.unitId" :multiple="false" :options="unitList"
                        labelKey="unitName"
-                       valueKey=unitId>
+                       valueKey="unitId">
             </SelectPop>
           </DkFormItem>
-          <!--辅助计量单位-->
-          <DkFormItem prop="subUnit">
-            <SelectPop v-model="formData.subUnitId" :multiple="false" :options="unitList" ref="subUnit"
-                       labelKey="subUnitName"
-                       valueKey=subUnitId>
+          <!--辅助单位-->
+          <DkFormItem prop="subUnitId" :label="$t('subUnit')">
+            <SelectPop v-model="formData.subUnitId" :multiple="false" :options="subUnitList"
+                       labelKey="unitName"
+                       valueKey="unitId">
             </SelectPop>
           </DkFormItem>
           <!--商品规格-->
@@ -68,34 +68,34 @@
           </DkFormItem>
           <!--单位换算-->
           <DkFormItem prop="conversionFactor">
-            <InputPop ref="conversionFactor" v-model="formData.conversionFactor"/>
+            <InputNumberPop ref="conversionFactor" v-model="formData.conversionFactor"/>
           </DkFormItem>
         </DkForm>
       </DkPanel>
       <DkPanel prop="priceItem">
-        <DkForm slot="content" ref="formInline" v-model="formData" :labelMaxWords=5>
+        <DkForm slot="content" ref="formInline" v-model="formData">
           <!--采购价-->
           <DkFormItem prop="pricePurchase">
-            <InputPop ref="pricePurchase" v-model="formData.pricePurchase"/>
+            <InputNumberPop ref="pricePurchase" v-model="formData.pricePurchase" />
           </DkFormItem>
           <!--零售价-->
           <DkFormItem prop="priceStandard">
-            <InputPop ref="priceStandard" v-model="formData.priceStandard"/>
+            <InputNumberPop ref="priceStandard" v-model="formData.priceStandard" />
           </DkFormItem>
           <!--批发价-->
           <DkFormItem prop="priceWholesale">
-            <InputPop ref="priceWholesale" v-model="formData.priceWholesale"/>
+            <InputNumberPop ref="priceWholesale" v-model="formData.priceWholesale"/>
           </DkFormItem>
           <!--销售售价-->
           <DkFormItem prop="priceLimited">
-            <InputPop ref="priceLimited" v-model="formData.priceLimited"/>
+            <InputNumberPop ref="priceLimited" v-model="formData.priceLimited"/>
           </DkFormItem>
         </DkForm>
       </DkPanel>
-      <DkPanel prop="库存信息">
-        <DkForm slot="content" ref="formInline" v-model="formData" :labelMaxWords=6>
+      <DkPanel prop="invInto">
+        <DkForm slot="content" ref="formInline" v-model="formData">
         <!--  仓库名称  -->
-        <DkFormItem prop="whName">
+        <DkFormItem prop="whId">
           <SelectMagnifier v-model="formData.whId" :display-text="formData.whName"
                            :type="this.$config.MagnifierType.warehouse"
                            :multiple="false"></SelectMagnifier>
@@ -106,15 +106,15 @@
         </DkFormItem>
         </DkForm>
       </DkPanel>
-      <DkPanel prop="备注信息">
-        <DkForm slot="content" ref="formInline" v-model="formData" :labelMaxWords=5>
+      <DkPanel prop="remarks">
+        <DkForm slot="content" ref="formInline" v-model="formData">
           <DkFormItem prop="remarks" :span="12">
             <InputPop ref="remarks" v-model="formData.remarks"
                       maxlength=500 textareaFlag/>
           </DkFormItem>
         </DkForm>
       </DkPanel>
-      <DkPanel prop="商品图片">
+      <DkPanel prop="skuImages">
         <div id="search-cond-div-files-info" ref="search-cond-div-files-info" slot="content">
           <DkPicWall v-model="formData.skuImages"
                      :table="$config.tables.sku" :accept="$config.uploadFileConfig.acceptPicType"></DkPicWall>
@@ -131,6 +131,7 @@
 
 <script>
 import {formMixin} from "@/mixins/form";
+import {button, columns, formTitle, loginTitle, messages, others} from "@/locale/lang/zh-CN";
 
 export default {
   components: {},
@@ -141,26 +142,26 @@ export default {
       seriesList:[],
       unitList:[],
       subUnitList:[],
-     formData: {
-       skuCode: null,
-       skuModel: null,
-       skuName: null,
-       brandId: null,//商品品牌
-       categoryId: null,//商品种类
-       seriesId: null,//商品系列
-       unitId: null,//计量单位
-       skuSpec: null,//商品规格
-       subUnitId: null,//辅助计量单位
-       conversionFactor: null, //单位换算
-       pricePurchase : null, //采购价
-       priceStandard : null, //零售价
-       priceWholesale : null,//批发价
-       priceLimited : null, //销售售价
-       nonStdCode:null,
-       whId:null,
-       whName:null,
-       skuImages:null,
-       remarks: null,
+      formData:{
+        skuCode: null,
+        skuModel: null,
+        skuName: null,
+        brandId: null,//商品品牌
+        brandName:null,
+        categoryId: null,//商品种类
+        seriesId: null,//商品系列
+        unitId: null,//计量单位
+        skuSpec: null,//商品规格
+        subUnitId: null,//辅助计量单位
+        conversionFactor: null, //单位换算
+        nonStdCode:null,
+        whId:null,
+        whName:null,
+        pricePurchase : null, //采购价
+        priceStandard : null, //零售价
+        priceWholesale : null,//批发价
+        priceLimited : null, //销售售价
+        remarks: null,
       },
     }
   },
@@ -215,7 +216,7 @@ export default {
       this.excute(this.$service.unitService, this.$service.unitService.selectByCond, {}).then(res => {
         if (res.code === this.$config.SUCCESS_CODE) {
           this.unitList = res.data.list;
-          this.subUnitList= res.data.list;
+          this.subUnitList=this.unitList.copy();
         }
       })
     },
@@ -230,6 +231,26 @@ export default {
     },
 
     /**
+     * @desc   : desc
+     * @author : 宋扬
+     * @date   : 2024/4/9 15:29
+     */
+    setValuesByEdit(data) {
+      if (data) {
+        this.formData = data;
+      }
+    },
+
+    /**
+     * @desc   : 通过id查询
+     * @author : 宋扬
+     * @date   : 2024/4/9 15:31
+     */
+    detail(id) {
+      return this.excuteNoParam(this.$service.goodsService, this.$service.goodsService.selectById, [id], false);
+    },
+
+    /**
      * @desc   : 保存数据
      * @author : 宋扬
      * @date   : 2024/4/8 16:30
@@ -238,14 +259,21 @@ export default {
       if (this.type === this.$config.formMode.add) {
         return this.excute(this.$service.goodsService, this.$service.goodsService.insert, this.params);
       } else if (this.type === this.$config.formMode.edit) {
-        return this.excute(this.$service.goodsService, this.$service.goodsService.edit, this.params);
+        console.log('22222',this.params)
+        return this.excute(this.$service.goodsService, this.$service.goodsService.update, this.params);
       }
     },
 
   },
+
+  /**
+   * @desc   : 在实例创建完成后被立即同步调用
+   * @author : 宋扬
+   * @date   : 2024/4/9 15:30
+   */
+  created() {
+    this.focusItem = 'skuId';    // 给第一个组件赋值，可以在混入中自动去聚焦
+    this.primaryKey = 'skuId'  // 设置主键Id
+  },
 }
 </script>
-
-<style scoped>
-
-</style>

src/view/mst/goods/index.vue

@@ -46,6 +46,13 @@
           <DkTableColumn field="skuName"></DkTableColumn>
           <DkTableColumn field="skuModel"></DkTableColumn>
           <DkTableColumn field="skuSpec"></DkTableColumn>
+          <DkTableColumn field="seriesName"></DkTableColumn>
+          <DkTableColumn field="brandName"></DkTableColumn>
+          <DkTableColumn field="shortName"></DkTableColumn>
+          <DkTableColumn field="pricePurchase"></DkTableColumn>
+          <DkTableColumn field="priceStandard"></DkTableColumn>
+          <DkTableColumn field="priceWholesale"></DkTableColumn>
+          <DkTableColumn field="priceLimited"></DkTableColumn>
           <DkTableColumn field="remarks"></DkTableColumn>
           <DkTableColumn field="flgValid" type="switch" ></DkTableColumn>
         </DkTable>
@@ -65,6 +72,7 @@ export default {
     return{
       leftData: [],
       tableData: [],
+      brandList: [],
       seriesId:null,
       split: 0.15,
       minSplit: 0.15,
@@ -105,7 +113,7 @@ export default {
     },
 
     /**
-     * @desc   : desc
+     * @desc   : 品牌
      * @author : 宋扬
      * @date   : 2024/4/8 13:23
      */
@@ -114,6 +122,7 @@ export default {
         if (res.code === this.$config.SUCCESS_CODE) {
           let list = this.searchContent.filter(it => it.valueFormat.code == 'goodsBrandList')
           if (list.length > 0) {
+            this.brandList = res.data.list
             list[0].valueFormat.data = res.data.list
           }
         }
@@ -126,16 +135,18 @@ export default {
      * @date   : 2024/4/7 14:30
      */
     getData(params){
-      if (this.seriesId) {
-        let data = {
-          seriesId: this.seriesId,
-          skuModel: this.searchCond._value['skuModel'],
-          skuName: this.searchCond._value['skuName'],
-        }
-        this.currentChangeEvent({row: data})
-      }
+      return this.excute(this.$service.goodsService,this.$service.goodsService.selectByCond,params)
     },
 
+    /**
+     * @desc   : 查询参数重新赋值
+     * @author : 宋扬
+     * @date   : 2024/4/9 9:10
+     */
+    setSearchParams(params){
+      params.seriesId = this.seriesId;
+      return params;
+    },
 
     /**
      * @desc   : 获取系列数据
@@ -143,7 +154,7 @@ export default {
      * @date   : 2024/4/7 15:10
      */
     getSeriesData(){
-      this.excute(this.$service.goodsSeriesService, this.$service.goodsSeriesService.getGoodsSeriesList, {}).then(res => {
+      return this.excute(this.$service.goodsSeriesService, this.$service.goodsSeriesService.getGoodsSeriesList, {}).then(res => {
         if (res.code === this.$config.SUCCESS_CODE) {
           this.leftData = res.data;
         }
@@ -156,20 +167,11 @@ export default {
      * @date   : 2024/4/7 15:03
      */
     currentChangeEvent({row}){
-      this.loading = true;
       if (row != null){
-        let params={
-          seriesId : row.seriesId,
-          skuModel : row.skuModel,
-          skuName : row.skuName,
-        }
-        this.excute(this.$service.goodsService,this.$service.goodsService.selectByCond,params).then(res => {
-          if (res.code === this.$config.SUCCESS_CODE) {
-            this.tableData = res.data.list
-          }
-        })
+        this.seriesId =  row.seriesId;
+        //调用查询事件
+        this.searchData();
       }
-      this.loading = false;
     }
 
   },
@@ -178,7 +180,6 @@ export default {
     this.routeObjName = 'goods'  // 设置路由名称
     this.comHandleEnableFlag = true; // 开启启用停用功能
   },
-
 }
 </script>