数据判重+页面替换共通

api/pages/common/common.js

@@ -29,6 +29,7 @@ module.exports = {
         getRole: 'get_role', //角色
         getGoods:'get_goods',// 获取商品档案
         getGoodsCategoryNoPage: 'get_goods_category_no_page', //商品种类不带分页
+        getGoodsSeriesNoPage: 'get_goods_series_no_page', //商品系列不带分页 刘尧 2024.05.29
         getGoodsBrandNoPage: 'get_goods_brand_no_page', //商品品牌不带分页  
         getGoodsCategoryTree:'get_goods_category_tree',//商品种类 树形查询
         getSupplierAndCustomerData: 'get_supplier_and_customer_by_page',

api/pages/mst/goodsSku.js

@@ -21,8 +21,8 @@ module.exports = {
             edit: { key: 'edit', url: '/package-basic-data/pages/product-file/add/add'  }, 
           goodsBrand: { key: 'chooseServiceCategory', url: '/package-base-select/pages/select-data/select-data',type:'brand',   },
           goodsCategory: { key: 'goodsCategory', url: '/package-basic-data/pages/product-file/product-types/product-types'  },
-          unit: { key: 'unit', url: '/package-basic-data/pages/product-file/metering-unit/metering-unit'  },
-          goodsSeries: { key: 'goodsSeries', url: '/package-basic-data/pages/product-file/product-series/product-series'  }, 
+          unit: { key: 'unit', url: '/package-base-select/pages/select-data/select-data', type:'series'  },
+          goodsSeries: { key: 'goodsSeries', url: '/package-base-select/pages/select-data/select-data',type:'series',}, 
           openingInventory: { key: 'openingInventory', url: '/package-base-select/pages/select-data/select-data', type: 'warehouse' },
           chooseWh: { key: 'chooseWh', url: '/package-base-select/pages/select-data/select-data',type:'warehouse'  }, 
           saleOrder:{key: 'saleOrder', url: '/package-sales/pages/order-billing/add/add' },

config/config.js

@@ -3,7 +3,7 @@ const profiles = 'dev';
 const configListObj = {
   // 北京东科企信软件有限公司 本地开发
   dev: {
-    server_add: 'http://192.168.0.57',     server_port: '7001',
+    server_add: 'http://192.168.0.93',     server_port: '7001',
     upload_url:'https://s.dev01.dkiboss.com:7000/api/mdm-server/file/upload',
     image_url:'https://s.dev01.dkiboss.com:7000/file',
     corpid: 'ww796c5d1684937b2f', //企业微信corpid

mixins/index.js

@@ -14,7 +14,7 @@ import Dialog from '@/dist/dialog/dialog.js';
 const app = getApp()
 
 module.exports = {
-  data: {
+  data: {  
     // 系统版本
     gradeCode: null,
     // 图片路径
@@ -531,7 +531,7 @@ module.exports = {
           })
         }, 2000)
       } else {
-        console.log('ffff',result);
+        // console.log('ffff',result);
         setTimeout(() => {
           this.setData({
             loading: false

package-base-select/pages/select-data/select-data.js

@@ -282,6 +282,13 @@ Page({
           name: item.brandName
         }
         break;
+      // 系列 刘尧 2024.05.29
+      case Constants.chooseType.series:
+        data = {
+          id: item.seriesId,
+          name: item.serieName
+        }
+        break;
       // 系统数据
       case Constants.chooseType.kindData:
         data = {
@@ -527,6 +534,7 @@ Page({
 
     // 读取传入的单据类型
     let chooseType = route.type
+    console.log(chooseType);
     switch (chooseType) {
       // 角色
       case Constants.chooseType.role:
@@ -779,6 +787,40 @@ Page({
           })
         }
         break;
+      // 系列 刘尧 2024.05.29
+      case Constants.chooseType.series:
+        title = "系列"
+        this.setData({
+          routeObjName: 'common',
+          routeObjNamePop: 'goodsSeries',
+          method: 'getGoodsSeriesNoPage',
+          chooseFlag: route.chooseFlag,
+          repeatFlag: route.repeatFlag,
+          valueKey: 'seriesId',
+          pageFlag: false,
+          popTitle: mixins.$t('add') + title,
+          title: 'serieName',
+          simpleFlag: true,
+          placeholder: ['seriesName']
+        })
+        break;
+      // 基本单位 刘尧 2024.05.29
+      case Constants.chooseType.unit: 
+        title = "基本单位"
+        this.setData({
+          routeObjName: 'common',
+          routeObjNamePop: 'unit',
+          method: 'getUnitListBy',
+          chooseFlag: route.chooseFlag,
+          repeatFlag: route.repeatFlag,
+          valueKey: 'unitId',
+          pageFlag: false,
+          popTitle: mixins.$t('add') + title,
+          title: 'unitName',
+          simpleFlag: true,
+          placeholder: ['unitName']
+        })
+      break;
       // 数据字典
       case Constants.chooseType.dictionary:
         title = "数据字典"

package-basic-data/pages/product-attribute/product-attribute.js

@@ -216,6 +216,7 @@ Page({
       return this.excute(service, service.update, params);
     } else { //新建 TODO
       return this.excute(service, service.insert, params).then(result => {
+        console.log('insert_result', result);
         if (result && result.data && result.data.code === Constants.SUCESS_CODE) {
           wx.showToast({
             title: '保存成功',
@@ -234,6 +235,8 @@ Page({
           this.selectComponent('#popup').setFormNull()
           // 执行查询方法
           this.searchData()
+        }else{
+          this.selectComponent('#popup').setLoading(false);
         }
       });;
     }

utils/Constants.js

@@ -104,6 +104,9 @@ module.exports = {
     warehouse: 'warehouse',
     // 品牌
     brand: 'brand',
+    // 系列
+    series: 'series',
+    unit: 'unit',// 基本单位
     inventorySku: 'inventorySku', //sku库存
     saleChannel: 'saleChannel', //销售渠道
     cusFrom: 'customerFrom', //客户来源