1、修改表单组件

components/dkbase/dk-form-bill/dk-form-bill.js

@@ -1000,7 +1000,11 @@ Component({
       let key = ds.key
       let item = ds.item
       let form = this.data.form
-      form[key] = e.detail
+      if(e.detail){
+        form[key] = e.detail;
+      }else{
+        delete form[key]
+      }
       let contentObj = this.data.contentObj;
       // 输入值后清空校验提示信息
       if (item.errMsg && e.detail) {

components/dkbase/dk-form-more-items/dk-form-more-items.js

@@ -797,6 +797,11 @@ Component({
       let index = ds.index
       let form = this.data.form
       form[this.data.itemName][index][key] = e.detail
+      if(e.detail){
+        form[this.data.itemName][index][key] = e.detail
+      }else{
+        delete form[this.data.itemName][index][key]
+      }
       // 输入值后清空校验提示信息
       if (form[this.data.itemName][index][key + '_errMsg'] && e.detail) {
         form[this.data.itemName][index][key + '_errMsg'] = undefined;
@@ -816,7 +821,11 @@ Component({
       let key = ds.key
       let item = ds.item
       let form = this.data.form
-      form[key] = e.detail
+      if(e.detail){
+        form[key] = e.detail;
+      }else{
+        delete form[key]
+      }
       let contentObj = this.data.contentObj;
       // 输入值后清空校验提示信息
       if (item.errMsg && e.detail) {

components/dkbase/dk-form/dk-form.js

@@ -429,7 +429,11 @@ Component({
       let key = ds.key
       let item = ds.item
       let form = this.data.form
-      form[key] = e.detail
+      if(e.detail){
+        form[key] = e.detail;
+      }else{
+        delete form[key]
+      }
       let contentObj = this.data.contentObj;
       // 输入值后清空校验提示信息
       if (item.errMsg && e.detail) {

components/dkbase/dk-save-button/dk-save-button.wxss

@@ -43,7 +43,7 @@
   height: 88rpx;
   font-size: 16px;
   line-height: 40rpx;
-  margin-left: 5rpx;
+  margin-left: 10rpx;
 }
 
 .checkbox-label{

mixins/index.js

@@ -16,7 +16,7 @@ const app = getApp()
 module.exports = {
   data: {
     // 系统版本
-    gradeCode:null,
+    gradeCode: null,
     // 图片路径
     imageUrl: config.image_url + '/static/img/',
     // 加载中
@@ -291,16 +291,16 @@ module.exports = {
         //阻止并提示信息
         if (routeUrl.tipMethod) {
           let result = this[routeUrl.tipMethod](item)
-          if(result){
-             // 是否弹出询问框
-             Dialog.confirm({
+          if (result) {
+            // 是否弹出询问框
+            Dialog.confirm({
               message: result,
             }).then(() => {
             }).catch(() => {
             })
             return
           }
-          
+
         }
         let _this = this;
         wx.navigateTo({
@@ -347,7 +347,7 @@ module.exports = {
             res.eventChannel.emit('params', data);
           }
         })
-      } else { 
+      } else {
         // 如果是方法就执行方法
         if (routeUrl.method) {
           // 有提示信息，就提出
@@ -414,7 +414,7 @@ module.exports = {
     wx.navigateTo({
       url: '/package-base-select/pages/web-view-select/web-view-select',
       success: function (res) {
-        res.eventChannel.emit('url', 'https://s.dev01.dkiboss.com:7000/wx-print?svc_code=' + app.globalData.company.svcCode + '&cp_id=' +  app.globalData.user.cpId + '&doc=' + docName + '&layout_id=' + layoutId + '&data_id=' + dataId);
+        res.eventChannel.emit('url', 'https://s.dev01.dkiboss.com:7000/wx-print?svc_code=' + app.globalData.company.svcCode + '&cp_id=' + app.globalData.user.cpId + '&doc=' + docName + '&layout_id=' + layoutId + '&data_id=' + dataId);
       }
     })
   },
@@ -485,7 +485,7 @@ module.exports = {
         if (this.handleData) {
           this.handleData();
         }
-        console.log('this.data.formMode',this.data.formMode,this.data.navigateBackFlag);
+        console.log('this.data.formMode', this.data.formMode, this.data.navigateBackFlag);
         //是否返回上一页
         if (!this.data.navigateBackFlag) {
           // 非新建页面回到上一个页面
@@ -677,10 +677,10 @@ module.exports = {
       params = Object.assign(params, otherSearchParams);
     }
     params.name = this.data.objectCode;
-    if(params.flgViewItem){
+    if (params.flgViewItem) {
       params.name = params.name + '-item'
     }
-   
+
     params.title = this.data.title;
     params.currentPage = 1;
     params.pageSize = Constants.MAX_PAGE_SIZE;
@@ -833,7 +833,7 @@ module.exports = {
    * @date : 2024/1/22
    */
   handleMoreDataIsValid(service, item, primaryKey) {
-    console.log('fff',item,item[primaryKey]);
+    console.log('fff', item, item[primaryKey]);
     if (service && item && item[primaryKey]) {
       let method = item.flgValid ? service.disable : service.enable;
       return this.excute(service, method, item[primaryKey]).then(res => {
@@ -888,8 +888,6 @@ module.exports = {
         this._other(other);
       }
     } else if (formMode == Constants.formMode.add) {
-      // 加载暂存数据
-      this.loadTempData();
       noMore = true;
     }
     this.setData({
@@ -902,11 +900,12 @@ module.exports = {
    * @date : 2024/1/22
    */
   loadTempData() {
-    setTimeout(()=>{
+    setTimeout(() => {
       var pages = getCurrentPages();
       var currentPage = pages[pages.length - 1];
       let formData = this.data.formData
       let formValue = app.globalData[currentPage.route];
+      console.log('fd', formData, formValue,);
       if (formValue && formData && formData != formValue) {
         Dialog.confirm({
           message: '是否加载缓存数据',
@@ -922,7 +921,7 @@ module.exports = {
           delete app.globalData[currentPage.route]
         })
       }
-    },300)
+    }, 300)
   },
   /**
    * @desc : 保存用户功能频率
@@ -982,7 +981,7 @@ module.exports = {
       }
     }
     this.setData({
-      gradeCode :app.globalData.company.gradeCode
+      gradeCode: app.globalData.company.gradeCode
     })
 
     // 接收父页面传递的参数
@@ -1051,6 +1050,13 @@ module.exports = {
         if (_this.loadInit) {
           _this.loadInit();
         }
+        if (data.formMode == Constants.formMode.add) {
+          setTimeout(() => {
+            // 加载暂存数据
+            _this.loadTempData();
+          },1000)
+
+        }
       })
     } else {
       // 加载后续数据
@@ -1072,9 +1078,9 @@ module.exports = {
     // 获取当前页面的路由
     var pages = getCurrentPages();
     var currentPage = pages[pages.length - 1];
-    if(!currentPage)return;
+    if (!currentPage) return;
     let route = currentPage.route;
-    console.log('formData',formData);
+    console.log('formData', formData);
     if (formData && formData != '{}') {
       // 记录缓存
       app.globalData[route] = formData;

package-sales/pages/sales-outbound/add/add.js

@@ -873,6 +873,10 @@ Page({
       currentDate.setDate(currentDate.getDate() + 7);
       formData.deliveryDate = util.formatDayTime(currentDate)
     } else if (this.data.formMode == Constants.formMode.add) {  //新建
+      //详情办理
+      wx.setNavigationBarTitle({
+        title: mixins.$t('add') + title
+      })
       //设置显示
       this.setFlagView()
       this.setStdAndPro()
@@ -894,7 +898,7 @@ Page({
     } else if (this.data.formMode == Constants.formMode.detailEdit) {
       //编辑
       wx.setNavigationBarTitle({
-        title: '编辑' + title
+        title: mixins.$t('edit') + title
       })
       //设置显示
       this.setFlagView()

package-sales/pages/sales-outbound/add/add.wxml

@@ -33,4 +33,4 @@ titpsLabel="titpsLabel"
 
 
 <!--  保存 -->
-<dk-save-button model:value="{{btnFormData}}" btnAutoWidthFlag="{{true}}" btnRightFlag="{{true}}" buttonList="{{buttonSaveList}}" contentList="{{contentSaveList}}" bind:open="saveButton" checkFlag="{{checkFlag}}" bind:change="saveChange"></dk-save-button>
+<dk-save-button model:value="{{btnFormData}}" btnAutoWidthFlag="{{false}}" btnRightFlag="{{true}}" buttonList="{{buttonSaveList}}" contentList="{{contentSaveList}}" bind:open="saveButton" checkFlag="{{checkFlag}}" bind:change="saveChange"></dk-save-button>