商品档案

package-base-select/pages/select-goods/select-goods.wxml

@@ -178,7 +178,7 @@
           </view>
         </view>
       </view>
-
+      <view style="height:200rpx"></view>
     </scroll-view>
 
   </view>
@@ -249,6 +249,7 @@
     </van-cell-group> 
     <view style="height:220rpx;"></view>
   </view>
+ 
 </view>
 
 

package-basic-data/pages/product-file/add/add.js

@@ -16,6 +16,10 @@ Page({
    * 页面的初始数据
    */
   data: {
+    buttonList: [{
+      name: 'merge',
+      title: mixins.$t("add"), //'保存'
+    }],
     table: Constants.tables.goodsSku,
     cardList: ['main', 'goods', "warehouse", 'price', 'other'],
     contentObj: {

package-basic-data/pages/product-file/add/add.wxml

@@ -7,9 +7,8 @@
 model:value="{{formData}}" bind:chooseData="chooseData"  >
 </dk-form>
  
-<view style="height: 16vw;"></view>
-<!--  保存 -->
-<view class="bottom-class">
-  <van-button custom-class="save-button-class" disabled="{{loading}}" loading="{{loading}}" bind:click="save" type="default">{{$t['save']}}
-  </van-button>
-</view>
+<view style="height: 200rpx;"></view>
+ 
+
+<!-- 新建按钮 -->
+<dk-save-button   btnAutoWidthFlag="{{true}}"  buttonList="{{buttonList}}"   bind:open="save"></dk-save-button>

package-inventory/pages/inventory-freeze/add/add.js

@@ -187,7 +187,18 @@ Page({
     * @author : 于继渤
     */
   saveData() {
-    return this.excute(this.data.service, this.data.service.insert, this.data.params);
+    return this.excute(this.data.service, this.data.service.insert, this.data.params).then(res => {
+      if (res.data.code == 200) {
+        let formData = {}
+        //采购人员和采购部门默认带出来（当前登录人
+        formData.staffId = app.globalData.user.staffId
+        formData.orgId = app.globalData.user.orgId
+        formData.staffName = app.globalData.user.staffName
+        formData.orgName = app.globalData.user.orgName 
+          this.setData({
+            formData: JSON.stringify(formData), 
+          })
+      }});
   },
 
   /**
@@ -255,13 +266,23 @@ Page({
      
       this.getItemDetal(this.data.id)
       this.setColumn()
-    }else if (this.data.formMode == Constants.formMode.detailEdit) {
+    }else if (this.data.formMode == Constants.formMode.detailEdit) { 
       //编辑
       wx.setNavigationBarTitle({
         title: '编辑库存冻结'
       })
       this.getItemDetal(this.data.id)
 
+    }else{ //新建
+      let formData = {}
+      //采购人员和采购部门默认带出来（当前登录人
+      formData.staffId = app.globalData.user.staffId
+      formData.orgId = app.globalData.user.orgId
+      formData.staffName = app.globalData.user.staffName
+      formData.orgName = app.globalData.user.orgName 
+        this.setData({
+          formData: JSON.stringify(formData), 
+        })
     }
   }
 })

package-purchase/pages/purchase-based-sales/purchase-based-sales.js

@@ -300,14 +300,10 @@ Page({
     this.setData({
       isSourceOrderFlag: (prevPage.route == 'package-purchase/pages/purchase-order/add/add')
     })
-    if (this.data.isSourceOrderFlag) {
+    if (this.data.isSourceOrderFlag) { 
       this.setData({
         // 弹出按钮
-        buttonList: [{
-          code: "cancel",
-          plain: true,
-          title: mixins.$t('cancel'), //'取消'
-        }, {
+        buttonList: [  {
           code: "save",
           title: mixins.$t('confirm'), //'确定'
         }],

package-purchase/pages/purchase-based-sales/purchase-based-sales.json

@@ -1,4 +1,4 @@
 {
     "usingComponents": {},
-    "navigationBarTitleText": "以销定采"
+    "navigationBarTitleText": "选择销售单"
 }