1、修改供应商的相关问题

api/pages/mst/supplier.js

@@ -27,7 +27,7 @@ module.exports = {
       toPurOrder:{ key: 'toPurOrder', url: '/package-purchase/pages/purchase-order/add/add', formMode: 'add' ,formType: 'add', idKey: 'supId' } ,
       toPurOrderReturn:{ key: 'toPurOrderReturn', url: '/package-purchase/pages/purchase-return/add/add',  formMode: 'add' ,formType: 'add', idKey: 'supId' } ,
       toPurReceipt:{ key: 'toPurReceipt', url: '/package-purchase/pages/pur-receipt/add/add', formMode: 'add',formType:'add', idKey: 'cusId', image:'btn-customer-collection.png' },
-      chooseSupplierCategory: { key: 'chooseSupplierCategory', url: '/package-base-select/pages/select-data/select-data',type:'kindData', kindType:'供应商类别' },
+      chooseSupplierCategory: { key: 'chooseSupplierCategory', url: '/package-base-select/pages/select-data/select-data',type:'kindData', kindType:'供应商类别' ,supTypeList: ["供应商类别-采购", "供应商类别-外协"]},
       chooseServiceCategory: { key: 'chooseServiceCategory', url: '/package-base-select/pages/select-data/select-data',type:'kindData', kindType:'服务类别' , chooseFlag:true },
       chooseStaff: { key: 'chooseStaff', url: '/package-base-select/pages/select-data/select-data',type:'staff'  },
       chooseOrg: { key: 'chooseOrg',url: '/package-base-select/pages/select-data/select-data',type:'org' }, 

mixins/index.js

@@ -324,7 +324,6 @@ module.exports = {
       name = 'add'
     }
     let routeUrl = this.data.route[name];
-    console.log('rreee',routeUrl,name);
     if (!routeUrl) return;
     this._openValidData(item, name, routeUrl.valid).then(res => {
       if (!res) {
@@ -398,7 +397,6 @@ module.exports = {
               data['formMode'] = Constants.formMode.add;
             }
             data['item'] = item
-            console.log('data', data);
             res.eventChannel.emit('params', data);
           }
         })
@@ -429,7 +427,6 @@ module.exports = {
   printedBill(row) {
     // 查询票据
     let docName = app.globalData['routeUrl'][this.data.routeObjName].docName
-    console.log('row',row,docName);
     if (!docName || !row || !row.id) {
       return;
     }

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

@@ -19,6 +19,7 @@ Page({
    */
   data: {
     annexPaths: [],
+    rpText:mixins.$t('collection'),
     dealFalg: "true",
     disabledSave: true,
     fileList: [],
@@ -94,18 +95,30 @@ Page({
    */
   handleSearchData(tableData) {
     let formData = JSON.parse(this.data.item)
-
+    let formType = this.data.formType
     //  根据formtype不同值 
-    // formType ：1 收款单 ，2 付款单，3 客户收款保存参数,4 客户退款 5 退收款单 6 退付款单  7 订单开单收款
-    if (this.data.formType == 1 || this.data.formType == 2 ||
-      this.data.formType == 5 || this.data.formType == 6) {
+    // formType ：1 收款单 ，2 付款单，3 客户收款保存参数,4 客户退款 5 退收款单 6 退付款单  7 订单开单收款 12:供应商付款 13 供应商退款
+    if(formType == 2 || formType == 12){
+      this.setData({
+        rpText:mixins.$t('payment')
+      })
+    }else if(formType == 4 || formType == 13){
+      this.setData({
+        rpText:mixins.$t('refund')
+      })
+    }
+    wx.setNavigationBarTitle({
+      title: this.data.rpText,
+    })
+    if (formType == 1 || formType == 2 ||
+      formType == 5 || formType == 6) {
       formData.sumAmount = formData.sumAmount
     }
     this.setData({
       formData: this.data.item,
       form: formData,
     })
-    if ((this.data.formType == 3 || this.data.formType == 4) && formData.editFlag) { //客户收款/退款编辑
+    if ((formType == 3 || formType == 4) && formData.editFlag) { //客户收款/退款编辑
 
       formData.dataItem.forEach(element => {
         tableData.forEach(item => {
@@ -122,7 +135,7 @@ Page({
       })
       // this.calculationScale(tableData)
     }
-    if (this.data.formType == 11 || this.data.formType == 8) {
+    if (formType == 11 || formType == 8) {
       this.setData({
         form: this.data.params,
         sumAmountSocial: this.data.params?.sumAmountSocial

package-base-select/pages/select-collection_confirm/select-collection_confirm.json

@@ -1,4 +1,3 @@
 {
-  "usingComponents": {},
-  "navigationBarTitleText":"收款"
+  "usingComponents": {}
 }

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

@@ -31,7 +31,7 @@
       </view>
     </view>
     <!-- 需收款  -->
-    <dk-cell center="" contentRight="{{false}}" fontSize="13" contentFontSize="17" contentColor="#FF7B1A" titleColor="#FFFFFF" contentFontWeight="bold" title="需收款：" content="{{sumAmt}}"></dk-cell> 
+    <dk-cell center="" contentRight="{{false}}" fontSize="13" contentFontSize="17" contentColor="#FF7B1A" titleColor="#FFFFFF" contentFontWeight="bold" title="需{{rpText}}：" content="{{sumAmt}}"></dk-cell> 
   </view>
 </view>
 
@@ -77,7 +77,7 @@
 
     <view style="height: 38rpx;"></view>
     <view style="text-align:center;font-size: 15px;line-height: 20px;color: #1B365D;">
-      <dk-text fontSize="15px" value="收款"></dk-text>
+      <dk-text fontSize="15px" value="{{rpText}}"></dk-text>
     </view>
     <view style="padding-top: 10rpx; text-align:center;">
 
@@ -87,7 +87,7 @@
     <view style="z-index: 12;margin-top:40rpx;box-shadow: 0px 4rpx 16rpx rgba(190, 144, 73, 0.5);border-radius: 15rpx;">
 
       <van-button round size="large" disabled="{{loadingButtonFlag}}" loading="{{loadingButtonFlag}}" color="#3E69F6"
-       custom-style="width:100%;height:90rpx" bind:click="save" type="info">确认收款
+       custom-style="width:100%;height:90rpx" bind:click="save" type="info">确认{{rpText}}
       </van-button>
     </view>
   </view>

package-purchase/pages/pur-receipt/add/add.js

@@ -10,6 +10,7 @@
 
 const Constants = require('@/utils/Constants.js');
 import Dialog from '@/dist/dialog/dialog.js';
+import util from '@/utils/util';
 const mixins = require('@/mixins/index.js')
 const app = getApp()
 Page({
@@ -28,8 +29,6 @@ Page({
     },],
     contentObj: {
       main: [
-
-
         {
           code: 'staffId',
           name: 'staffName',
@@ -69,7 +68,7 @@ Page({
     objInfo: {},
     buttonSaveList: [{
       code: 'add',
-      title: mixins.$t("collection")
+      title: mixins.$t("payment")
     }],
     contentSaveList: [{
       code: 'need',
@@ -96,7 +95,6 @@ Page({
       contentSaveList: contentSaveList
     })
   },
-
   /**
    * @desc   : 非空校验
    * @author : 周兴
@@ -138,6 +136,11 @@ Page({
     if (!_this.validDatas(data)) {
       return
     }
+    // 校验供应商
+    if(!data.supId){
+      util.showToast('请先选择供应商');
+      return;
+    }
     if (!data.sumAmtPay || data.sumAmtPay == 0) {
       // 是否弹出询问框
       Dialog.confirm({
@@ -249,7 +252,6 @@ Page({
   chooseData(e) {
     let item = e.detail.data
     let code = e.detail.code
-    console.log('chooseData', e)
     let formData = JSON.parse(this.data.formData)
     if (code == "staffId") { //员工
       formData.staffId = item.data.id
@@ -272,7 +274,6 @@ Page({
 
 
   chooseObjTypeData(e) {
-    console.log('chooseObjTypeData', e.detail.data.objInfo)
     let objInfo = e.detail.data.objInfo
     let formData = JSON.parse(this.data.formData)
     formData.contactName = objInfo.contactName

package-purchase/pages/purchase-order/add/add.js

@@ -652,20 +652,20 @@ Page({
         title: mixins.$t('addPurOrder') //"新建采购订单",
       })
       //下面的赋值 只能新建赋值 编辑在setValuesByEdit里赋值
-      let formdata = JSON.parse(this.data.formData)
+      // let formdata = JSON.parse(this.data.formData)
       //.预计入库日期默认赋值“后一天”，预计入库仓库默认附上当前登录人所在组织的默认仓库，如组织上没有没人仓库，去找基础资料中仓库的默认值附上
       let dataTime = this.getTomorrowsDateTimestamp()
-      formdata.pickupDate = this.getTomorrowsDateString()
-      formdata.whId = app.globalData.user.defaultWhId
-      formdata.whName = app.globalData.user.defaultWhName
+      formData.pickupDate = this.getTomorrowsDateString()
+      formData.whId = app.globalData.user.defaultWhId
+      formData.whName = app.globalData.user.defaultWhName
       if (this.data.formReturnMode == 'supplier') {
         //供应商详情跳转来的 新建  formdata 是小写的 注意
-        formdata.supId = this.data.item.supId
-        formdata.supName = this.data.item.supName
+        formData.supId = this.data.item.supId
+        formData.supName = this.data.item.supName
       }
       this.setData({
         dataTime: dataTime,
-        formData: JSON.stringify(formdata)
+        formData: JSON.stringify(formData)
       })
       // 系统参数
       if (!that.data.flgAutoHandle) {

package-purchase/pages/supplier-list/add/add.js

@@ -164,9 +164,9 @@ Page({
     }
     let contentObj = this.data.contentObj //期初余额 编辑不可编辑
     let index = contentObj.staff.findIndex(t => t.code == 'startAmount')
-    if(index != -1){
+    if (index != -1) {
       contentObj.staff[index].readonly = true
-    } 
+    }
     //新建的时候 不显示编码 编辑的时候 显示编码
     contentObj.main = [{
       code: 'supCode',
@@ -207,14 +207,14 @@ Page({
       title: mixins.$t("brandId"),
       type: 'choose',
       urlKey: 'chooseBrandy',
-      hide:data.supType == Constants.kindCode.supplierService?true:false,
+      hide: data.supType == Constants.kindCode.supplierService ? true : false,
     }, { //服务类别 
       code: 'serviceCategorie',
       name: 'serviceCategoriesName',
       title: mixins.$t("ServiceCategories"),
       type: 'choose',
       urlKey: 'chooseServiceCategory',
-      hide:data.supType != Constants.kindCode.supplierService?true:false,
+      hide: data.supType != Constants.kindCode.supplierService ? true : false,
     }, { //联系人
       code: 'contactName',
       type: 'textarea',
@@ -269,7 +269,7 @@ Page({
    * @date : 2024/5/21 15:49
    * @author : 周兴
    */
-  handleSaveData(){
+  handleSaveData() {
     // 赋值默认的供应商类别
     this.loadInit();
 
@@ -293,12 +293,12 @@ Page({
    * @author : 王英杰
    */
   loadInit() {
+    let formType = this.data.formType;
     // 标准版：新建供应商类型默认外协供应商，且不能点开；
     //专业版：默认采购供应商，点开是侧拉样式不是跳页（因为不能新建）；
     let contentObj = this.data.contentObj
     let formData = this.data.formData ? JSON.parse(this.data.formData) : {}
-    if (this.data.gradeCode == Constants.gradeCode.STD ||
-      this.data.formType == Constants.chooseType.outSupplier) { //标准 
+    if (this.data.gradeCode == Constants.gradeCode.STD) { //标准 
       contentObj.main = [{ //供应商名称
         code: 'supName',
         type: 'textarea',
@@ -310,11 +310,11 @@ Page({
         title: mixins.$t("supplierType"),
         type: 'drop',
         dropType: 'supType',
-        clear:false,
+        clear: false,
         // type: 'choose',
         // urlKey: 'chooseSupplierCategory',
         required: true,
-        readonly: true,
+        readonly: (formType=='supplier' || formType=='outSupplier')?true:false,
         changeObj: {
           [Constants.kindCode.supplierPur]: {
             hide: ['serviceCategorie'],
@@ -357,14 +357,16 @@ Page({
         title: mixins.$t("returnAddress"),
       }
       ]
-      if(this.data.item && this.data.item.defaultSupplier){
-        formData.supType = Constants.kindCode.supplierPur// "供应商类别-采购"
-        formData.supTypeName = mixins.$t("procurementSupplier") //"采购供应商"
-      }else{
-        formData.supType = Constants.kindCode.supplierOutsourcing// "供应商类别-外协"
-        formData.supTypeName = mixins.$t("outsourcingSupplier") //"外协供应商"
-      }
 
+      if (formType) {
+        if (formType == 'supplier') {
+          formData.supType = Constants.kindCode.supplierPur// "供应商类别-采购"
+          formData.supTypeName = mixins.$t("procurementSupplier") //"采购供应商"
+        } else if (formType == 'outSupplier') {
+          formData.supType = Constants.kindCode.supplierOutsourcing// "供应商类别-外协"
+          formData.supTypeName = mixins.$t("outsourcingSupplier") //"外协供应商"
+        }
+      }
     } else if (this.data.gradeCode == Constants.gradeCode.PRO) { //专业
       contentObj.main = [{ //供应商名称
         code: 'supName',

package-purchase/pages/supplier-list/detail/detail.wxml

@@ -75,7 +75,7 @@
           </dk-cell>
         </view>
         <view class="oreder-summary-detail">
-          余额
+          欠款
         </view>
       </view>
     </view>