Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss_wx_app

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

@@ -987,6 +987,10 @@ Component({
      * @date   : 2024/2/2 11:46
      */
     clearField(e) {
+      // 只读
+      if (this.data.readonly) {
+        return;
+      }
       let ds = e.currentTarget.dataset
       let key = ds.key
       let form = this.data.form
@@ -1039,6 +1043,7 @@ Component({
      * @date   : 2024/2/2 11:46
      */
     clearChoose(e) {
+      
       let ds = e.currentTarget.dataset
       let key = ds.key
       let name = ds.name

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

@@ -164,15 +164,15 @@
           </van-field>
           <!--选单-->
           <van-field wx:if="{{item.type=='choose' && (item.show || item.show == undefined) && !item.hide}}" type="textarea" required="{{item.required?true:false }}" data-name="{{item.name}}" data-key="{{item.code}}" data-item="{{item}}" data-index="{{index}}" data-card="{{card.name}}" value="{{ form[item.name]}}" input-align="left" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" is-link catchtap="open" autosize border="{{ false }}" readonly="{{true}}" input-class="dk-cell-value-class" data-type='{{item.dropType}}' errorMessage="{{item.errMsg}}">
-            <van-icon wx:if="{{ form[item.name] && (item.clear || item.clear == undefined)}}" slot="icon" name="clear" color="#c8c9cc;" data-item="{{item}}" data-name="{{item.name}}" data-key="{{item.code}}" catchtap="clearChoose"></van-icon>
+            <van-icon wx:if="{{!readonly && form[item.name] && (item.clear || item.clear == undefined)}}" slot="icon" name="clear" color="#c8c9cc;" data-item="{{item}}" data-name="{{item.name}}" data-key="{{item.code}}" catchtap="clearChoose"></van-icon>
           </van-field>
           <!--单选下拉-->
-          <van-field wx:if="{{item.type=='drop'  && (item.show || item.show == undefined)}}" required="{{item.required?true:false }}" data-name="{{item.name}}" data-key="{{item.code}}" data-item="{{item}}" data-index="{{index}}" data-card="{{card.name}}" value="{{ form[item.name]}}" input-align="left" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" catchtap="open" autosize border="{{ false }}" clearable readonly="{{true}}" input-class="dk-cell-value-class" data-type='{{item.dropType}}' errorMessage="{{item.errMsg}}">
-            <van-icon wx:if="{{ form[item.code]}}" slot="icon" name="clear" color="#c8c9cc;" data-item="{{item}}" data-name="{{item.name}}" data-key="{{item.code}}" catchtap="clearChoose"></van-icon>
+          <van-field wx:if="{{item.type=='drop'  && (item.show || item.show == undefined)}}" required="{{item.required?true:false }}" data-name="{{item.name}}" data-key="{{item.code}}" data-item="{{item}}" data-index="{{index}}" data-card="{{card.name}}" value="{{ form[item.name]}}" input-align="left" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" catchtap="open" autosize border="{{ false }}" clearable="{{false}}" readonly="{{true}}" input-class="dk-cell-value-class" data-type='{{item.dropType}}' errorMessage="{{item.errMsg}}">
+            <van-icon wx:if="{{!readonly && form[item.code]}}" slot="icon" name="clear" color="#c8c9cc;" data-item="{{item}}" data-name="{{item.name}}" data-key="{{item.code}}" catchtap="clearChoose"></van-icon>
           </van-field>
           <!--多选下拉-->
-          <van-field wx:if="{{item.type=='mutidrop'  && (item.show || item.show == undefined)}}" required="{{item.required?true:false }}" data-name="{{item.name}}" data-key="{{item.code}}" data-item="{{item}}" data-index="{{index}}" data-card="{{card.name}}" value="{{ form[item.name + 's']}}" input-align="left" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" is-link catchtap="open" autosize border="{{ false }}" clearable readonly="{{true}}" input-class="dk-cell-value-class" data-type='{{item.dropType}}' errorMessage="{{item.errMsg}}">
-            <van-icon wx:if="{{ form[item.code]}}" slot="icon" name="clear" color="#c8c9cc;" data-item="{{item}}" data-name="{{item.name}}" data-key="{{item.code}}" catchtap="clearChoose"></van-icon>
+          <van-field wx:if="{{item.type=='mutidrop'  && (item.show || item.show == undefined)}}" required="{{item.required?true:false }}" data-name="{{item.name}}" data-key="{{item.code}}" data-item="{{item}}" data-index="{{index}}" data-card="{{card.name}}" value="{{ form[item.name + 's']}}" input-align="left" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" is-link catchtap="open" autosize border="{{ false }}" clearable="{{false}}" readonly="{{true}}" input-class="dk-cell-value-class" data-type='{{item.dropType}}' errorMessage="{{item.errMsg}}">
+            <van-icon wx:if="{{ !readonly && form[item.code]}}" slot="icon" name="clear" color="#c8c9cc;" data-item="{{item}}" data-name="{{item.name}}" data-key="{{item.code}}" catchtap="clearChoose"></van-icon>
           </van-field>
           <!--选择框-->
           <van-field wx:if="{{item.type=='checkbox'  && (item.show || item.show == undefined)}}" input-width="200rpx" input-class="dk-cell-value-class" label-class="nomal-label" input-align="left" value="{{ form[item.code] ? '  需要' : '  不需要' }}" label="{{item.title?item.title:$t[item.code]}}" autosize border="{{ false }}" readonly="{{true}}" errorMessage="{{item.errMsg}}">
@@ -197,7 +197,7 @@
           <dk-number-phone-input wx:if="{{item.type=='phone'  && (item.show || item.show == undefined)}}" data-key="{{item.code}}" data-item="{{item}}" data-index="{{index}}" data-card="{{card.name}}" readonly="{{!!readonly || !!item.readonly}}" required="{{item.required?true:false }}" clearable rightIcon="phone" model:value="{{ form[item.code]}}" bind:changeField="changePhone" bind:changeFieldblur="changePhoneblur" bind:clear="clearField" errorMessage="{{item.errMsg}}" id="{{item.code}}" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.code)}}"></dk-number-phone-input>
           <!--日期-->
           <van-field wx:if="{{item.type=='date'  && (item.show || item.show == undefined)}}" required="{{item.required?true:false }}" is-link value="{{ form[item.code]}}" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" data-item="{{item}}" data-key="{{item.code}}" data-index="{{index}}" clearable data-card="{{card.name}}" errorMessage="{{item.errMsg}}" border="{{ false }}" readonly="{{true}}" input-class="dk-cell-value-class" catchtap="openDatePop">
-            <van-icon wx:if="{{ form[item.code]}}" slot="icon" name="clear" color="#c8c9cc;" data-key="{{item.code}}" catchtap="clearDate"></van-icon>
+            <van-icon wx:if="{{!readonly && form[item.code]}}" slot="icon" name="clear" color="#c8c9cc;" data-key="{{item.code}}" catchtap="clearDate"></van-icon>
           </van-field>
           <!--数字类-->
           <dk-number-input wx:if="{{item.type=='number'  && (item.show || item.show == undefined)}}" sign="{{(item.sign || item.sign == '')?item.sign:'¥'}}" digits="{{(item.digits || item.digits == 0)?item.digits:2}}" fontSize="14" left="30rpx" data-key="{{item.code}}" data-item="{{item}}" data-index="{{index}}" data-card="{{card.name}}" center="left" readonly="{{!!readonly || !!item.readonly}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" errorMessage="{{item.errMsg}}" titleValue="{{item.title?item.title:$t[item.code]}}" inputColor="#CAA977" titleFontWeight="normal" titleColor="#95A8CB" inputValue="{{form[item.code]}}" negative="{{item.negative}}" maxFlag="{{item.maxFlag}}" max="{{item.max}}" bind:triggerBindBlur="changeNumberBlur" bind:triggerBindValue="changeNumberField"></dk-number-input>

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

@@ -69,7 +69,7 @@
             </van-field>
             <!--选单-->
             <van-field wx:if="{{item.type=='choose' }}" required="{{item.required?true:false }}" data-name="{{item.name}}" data-key="{{item.code}}" data-item="{{item}}" data-index="{{indext}}" data-card="{{card.name}}" value="{{ itemt[item.name]}}" input-align="left" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" is-link catchtap="open" autosize border="{{ false }}" readonly="{{true}}" input-class="dk-cell-value-class" data-type='{{item.dropType}}' errorMessage="{{itemt[item.code + '_errMsg']}}">
-              <van-icon wx:if="{{ itemt[item.name]}}" slot="icon" name="clear" color="#c8c9cc;" data-item="{{item}}" data-name="{{item.name}}" data-card="{{card.name}}" data-key="{{item.code}}" catchtap="clearChoose"></van-icon>
+              <van-icon wx:if="{{!readonly &&  itemt[item.name]}}" slot="icon" name="clear" color="#c8c9cc;" data-item="{{item}}" data-name="{{item.name}}" data-card="{{card.name}}" data-key="{{item.code}}" catchtap="clearChoose"></van-icon>
             </van-field>
             <!--选择框-->
             <van-field wx:if="{{item.type=='checkbox'}}" input-width="200rpx" input-class="dk-cell-value-class" label-class="nomal-label" input-align="left" value="{{ itemt[item.code] ? '  需要' : '  不需要' }}" label="{{item.title?item.title:$t[item.code]}}" autosize border="{{ false }}" readonly="{{true}}" errorMessage="{{itemt[item.code + '_errMsg']}}">
@@ -107,15 +107,15 @@
       </van-field>
       <!--下拉-->
       <van-field wx:if="{{item.type=='drop'}}" required="{{item.required?true:false }}" data-name="{{item.name}}" data-key="{{item.code}}" data-item="{{item}}" data-index="{{index}}" data-card="{{card.name}}" value="{{ form[item.name]}}" input-align="left" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" is-link catchtap="open" autosize border="{{ false }}" readonly="{{true}}" input-class="dk-cell-value-class" data-type='{{item.dropType}}' errorMessage="{{item.errMsg}}">
-        <van-icon wx:if="{{ form[item.code]}}" slot="icon" name="clear" color="#c8c9cc;" data-item="{{item}}" data-name="{{item.name}}" data-key="{{item.code}}" catchtap="clearChoose"></van-icon>
+        <van-icon wx:if="{{!readonly &&  form[item.code]}}" slot="icon" name="clear" color="#c8c9cc;" data-item="{{item}}" data-name="{{item.name}}" data-key="{{item.code}}" catchtap="clearChoose"></van-icon>
       </van-field>
       <!--选单-->
       <van-field wx:if="{{item.type=='choose' }}" required="{{item.required?true:false }}" data-name="{{item.name}}" data-key="{{item.code}}" data-item="{{item}}" data-index="{{index}}" data-card="{{card.name}}" value="{{ form[item.name]}}" input-align="left" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" is-link catchtap="open" autosize border="{{ false }}" readonly="{{true}}" input-class="dk-cell-value-class" data-type='{{item.dropType}}' errorMessage="{{item.errMsg}}">
-        <van-icon wx:if="{{ form[item.name]}}" slot="icon" name="clear" color="#c8c9cc;" data-item="{{item}}" data-name="{{item.name}}" data-card="{{card.name}}" data-key="{{item.code}}" catchtap="clearChoose"></van-icon>
+        <van-icon wx:if="{{!readonly &&  form[item.name]}}" slot="icon" name="clear" color="#c8c9cc;" data-item="{{item}}" data-name="{{item.name}}" data-card="{{card.name}}" data-key="{{item.code}}" catchtap="clearChoose"></van-icon>
       </van-field>
       <!--日期-->
       <van-field wx:if="{{item.type=='date' }}" required="{{item.required?true:false }}" is-link value="{{ form[item.code]}}" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" data-item="{{item}}" data-key="{{item.code}}" data-index="{{index}}" clearable data-card="{{card.name}}" errorMessage="{{item.errMsg}}" border="{{ false }}" readonly="{{true}}" input-class="dk-cell-value-class" catchtap="openDatePop">
-        <van-icon wx:if="{{ form[item.code]}}" slot="icon" name="clear" color="#c8c9cc;" data-key="{{item.code}}" catchtap="clearDate"></van-icon>
+        <van-icon wx:if="{{!readonly &&  form[item.code]}}" slot="icon" name="clear" color="#c8c9cc;" data-key="{{item.code}}" catchtap="clearDate"></van-icon>
       </van-field>
       <!--选择框-->
       <van-field wx:if="{{item.type=='checkbox'}}" input-width="200rpx" input-class="dk-cell-value-class" label-class="nomal-label" input-align="left" value="{{ form[item.code] ? '  需要' : '  不需要' }}" label="{{item.title?item.title:$t[item.code]}}" autosize border="{{ false }}" readonly="{{true}}" errorMessage="{{item.errMsg}}">
@@ -132,7 +132,7 @@
       <!--客户地址-->
       <van-field wx:if="{{item.type=='address'}}" input-width="200rpx" input-class="dk-cell-value-class" required="{{item.required?true:false }}" input-align="left" data-key="address" type="textarea" value="{{ wxmlUtil.addressToIndexOf(form.address.address) }}" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" autosize border="{{ false }}" right-icon="location" data-type='address' catchtap="onClickWxchartAddress" readonly="{{true}}" data-item="{{item}}" data-index="{{index}}" data-card="{{card.name}}" errorMessage="{{item.errMsg}}">
         <view style="display: flex;" slot="right-icon">
-          <van-icon wx:if="{{ form.address.address}}" slot="right-icon" name="clear" color="#c8c9cc;" data-key="{{item.code}}" catchtap="clearAddress"></van-icon>
+          <van-icon wx:if="{{!readonly &&  form.address.address}}" slot="right-icon" name="clear" color="#c8c9cc;" data-key="{{item.code}}" catchtap="clearAddress"></van-icon>
           <van-icon custom-style="padding-left:10rpx" name="location"></van-icon>
         </view>
       </van-field>

components/dkbase/dk-form/dk-form.wxml

@@ -9,15 +9,15 @@
       </van-field>
       <!--单选下拉-->
       <van-field wx:if="{{item.type=='drop' && !item.hide}}"required="{{item.required?true:false }}"  data-name="{{item.name}}" data-key="{{item.code}}" data-item="{{item}}" data-index="{{index}}" data-card="{{card}}" value="{{ form[item.name]}}" input-align="left" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" is-link catchtap="open" autosize border="{{ false }}" readonly="{{true}}" input-class="dk-cell-value-class" data-type='{{item.dropType}}' errorMessage="{{item.errMsg}}">
-        <van-icon wx:if="{{ form[item.code]}}" slot="icon" name="clear" color="#c8c9cc;"  data-name="{{item.name}}" data-key="{{item.code}}" catchtap="clearChoose"></van-icon>
+        <van-icon wx:if="{{!readonly &&  form[item.code]}}" slot="icon" name="clear" color="#c8c9cc;"  data-name="{{item.name}}" data-key="{{item.code}}" catchtap="clearChoose"></van-icon>
       </van-field>
       <!--多选下拉-->
       <van-field wx:if="{{item.type=='mutidrop' && !item.hide}}"required="{{item.required?true:false }}"  data-name="{{item.name}}" data-key="{{item.code}}" data-item="{{item}}" data-index="{{index}}" data-card="{{card}}" value="{{ form[item.name + 's']}}" input-align="left" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" is-link catchtap="open" autosize border="{{ false }}" readonly="{{true}}" input-class="dk-cell-value-class" data-type='{{item.dropType}}' errorMessage="{{item.errMsg}}">
-        <van-icon wx:if="{{ form[item.code]}}" slot="icon" name="clear" color="#c8c9cc;" data-name="{{item.name}}" data-key="{{item.code}}" catchtap="clearChoose"></van-icon>
+        <van-icon wx:if="{{!readonly &&  form[item.code]}}" slot="icon" name="clear" color="#c8c9cc;" data-name="{{item.name}}" data-key="{{item.code}}" catchtap="clearChoose"></van-icon>
       </van-field>
       <!--选单-->
       <van-field wx:if="{{item.type=='choose' && !item.hide}}"required="{{item.required?true:false }}"  data-name="{{item.name}}" data-key="{{item.code}}" data-item="{{item}}" data-index="{{index}}" data-card="{{card}}" value="{{ form[item.name]}}" input-align="left" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{item.placeholder ? item.placeholder : wxmlUtil.setPlaceholder($t, item.title?item.title:item.code)}}" is-link catchtap="open" autosize border="{{ false }}" readonly="{{true}}" input-class="dk-cell-value-class" data-type='{{item.dropType}}' errorMessage="{{item.errMsg}}">
-        <van-icon wx:if="{{ form[item.code]}}" slot="icon" name="clear" color="#c8c9cc;" data-name="{{item.name}}" data-key="{{item.code}}" catchtap="clearChoose"></van-icon>
+        <van-icon wx:if="{{!readonly &&  form[item.code]}}" slot="icon" name="clear" color="#c8c9cc;" data-name="{{item.name}}" data-key="{{item.code}}" catchtap="clearChoose"></van-icon>
       </van-field>
       <!--选择框-->
       <van-field wx:if="{{item.type=='checkbox' && !item.hide}}" input-width="200rpx" input-class="dk-cell-value-class" label-class="nomal-label" input-align="left" label="{{item.title?item.title:$t[item.code]}}" autosize border="{{ false }}" readonly="{{true}}" errorMessage="{{item.errMsg}}">
@@ -49,11 +49,11 @@
 
       <!--日期-->
       <van-field wx:if="{{item.type=='date'}}"required="{{item.required?true:false }}"  is-link value="{{ form[item.code]}}" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" data-item="{{item}}" data-key="{{item.code}}" data-index="{{index}}" data-card="{{card.name}}" errorMessage="{{item.errMsg}}" clearable border="{{ false }}" readonly="{{true}}" input-class="dk-cell-value-class" catchtap="openDatePop">
-        <van-icon wx:if="{{ form[item.code]}}" slot="icon" name="clear" color="#c8c9cc;" data-key="{{item.code}}" catchtap="clearDate"></van-icon>
+        <van-icon wx:if="{{!readonly &&  form[item.code]}}" slot="icon" name="clear" color="#c8c9cc;" data-key="{{item.code}}" catchtap="clearDate"></van-icon>
       </van-field>
       <!--时间-->
       <van-field wx:if="{{item.type=='dateTime'}}"required="{{item.required?true:false }}"  is-link value="{{ form[item.code]}}" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" data-item="{{item}}" data-key="{{item.code}}" data-index="{{index}}" data-card="{{card.name}}" errorMessage="{{item.errMsg}}" border="{{ false }}" clearable readonly="{{true}}" input-class="dk-cell-value-class" catchtap="openDatePopTime">
-        <van-icon wx:if="{{ form[item.code]}}" slot="icon" name="clear" color="#c8c9cc;" data-key="{{item.code}}" catchtap="clearDate"></van-icon>
+        <van-icon wx:if="{{!readonly &&  form[item.code]}}" slot="icon" name="clear" color="#c8c9cc;" data-key="{{item.code}}" catchtap="clearDate"></van-icon>
       </van-field>
       <!--tab标签-->
       <van-field wx:if="{{item.type=='tabs' && !item.hide}}" input-width="200rpx" input-class="dk-cell-value-class" label-class="nomal-label" input-align="left" label="{{item.title?item.title:$t[item.code]}}" autosize border="{{ false }}" readonly="{{true}}" errorMessage="{{item.errMsg}}">
@@ -65,7 +65,7 @@
       <!--客户地址-->
       <van-field wx:if="{{item.type=='address' && !item.hide}}" input-width="200rpx" input-class="dk-cell-value-class"required="{{item.required?true:false }}"  input-align="left" data-key="address" type="textarea" value="{{ wxmlUtil.addressToIndexOf(form.address.address) }}" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" autosize border="{{ false }}" data-type='address' catchtap="onClickWxchartAddress" readonly="{{true}}" data-item="{{item}}" data-index="{{index}}" data-card="{{card}}" errorMessage="{{item.errMsg}}">
         <view style="display: flex;" slot="right-icon">
-          <van-icon wx:if="{{ form.address.address}}" slot="right-icon" name="clear" color="#c8c9cc;" data-key="{{item.code}}" catchtap="clearAddress"></van-icon>
+          <van-icon wx:if="{{!readonly &&  form.address.address}}" slot="right-icon" name="clear" color="#c8c9cc;" data-key="{{item.code}}" catchtap="clearAddress"></van-icon>
           <van-icon custom-style="padding-left:10rpx" name="location"></van-icon>
         </view>
       </van-field>

i18n/zh-CN.js

@@ -251,6 +251,7 @@ const basicData = {
   reasonOutboundSys: '基础资料-出库',
   accountCategorySys: '基础资料-账户',
   customerSourceSys: '基础资料-来源',
+  profitLossSys: '基础资料-盈亏原因',
   saleStaff: '销售人员',
   saleOrg: '销售部门',
   initialDebtOwed: '初次欠款',
@@ -261,6 +262,8 @@ const basicData = {
   accountCategory: '账户类别',
   customerSource: '客户来源',
   customerlabel: '客户标签',
+  profitLossName: '原因名称',
+  profitLossCode: '原因编码',
   whCode: '仓库编码',
   whName: '仓库名称',
   supervisor: '仓库主管',

package-accounts-manage/pages/payment-order/add-return/add-return.js

@@ -550,6 +550,15 @@ Page({
  * @author : 姜永辉
  */
   handleData() {
+    let contentList = this.data.contentList
+    contentList.forEach(it => {
+      if (it.type == 'number') {
+        it.content = 0
+      }
+    })
+    this.setData({
+      contentList,
+    })
     this.setData({
       formData: JSON.stringify({ accDate: new Date().toDateStr() })
     })
@@ -586,6 +595,15 @@ Page({
       events: {
         // 回调后
         refresh: function (data) {
+          let contentList = _this.data.contentList
+          contentList.forEach(it => {
+            if (it.type == 'number') {
+              it.content = 0
+            }
+          })
+          _this.setData({
+            contentList,
+          })
           // 保存成功后 回调
           _this.setData({
             formData: JSON.stringify({ accDate: new Date().toDateStr() })

package-accounts-manage/pages/payment-order/add/add.js

@@ -524,6 +524,15 @@ Page({
 * @author : 姜永辉
 */
   handleData() {
+    let contentList = this.data.contentList
+    contentList.forEach(it => {
+      if (it.type == 'number') {
+        it.content = 0
+      }
+    })
+    this.setData({
+      contentList,
+    })
     this.setData({
       formData: JSON.stringify({ accDate: new Date().toDateStr() })
     })
@@ -559,6 +568,15 @@ Page({
       events: {
         // 回调后
         refresh: function (data) {
+          let contentList = _this.data.contentList
+          contentList.forEach(it => {
+            if (it.type == 'number') {
+              it.content = 0
+            }
+          })
+          _this.setData({
+            contentList,
+          })
           // 保存成功后 回调
           _this.setData({
             formData: JSON.stringify({ accDate: new Date().toDateStr() })

package-accounts-manage/pages/receipt/add-return/add-return.js

@@ -538,6 +538,15 @@ Page({
  * @author : 姜永辉
  */
   handleData() {
+    let contentList = this.data.contentList
+    contentList.forEach(it => {
+      if (it.type == 'number') {
+        it.content = 0
+      }
+    })
+    this.setData({
+      contentList,
+    })
     this.setData({
       formData: JSON.stringify({ accDate: new Date().toDateStr() })
     })
@@ -573,6 +582,15 @@ Page({
       events: {
         // 回调后
         refresh: function (data) {
+          let contentList = _this.data.contentList
+          contentList.forEach(it => {
+            if (it.type == 'number') {
+              it.content = 0
+            }
+          })
+          _this.setData({
+            contentList,
+          })
           // 保存成功后 回调
           _this.setData({
             formData: JSON.stringify({ accDate: new Date().toDateStr() })

package-accounts-manage/pages/receipt/add/add.js

@@ -521,6 +521,15 @@ Page({
   * @author : 姜永辉
   */
   handleData() {
+    let contentList = this.data.contentList
+    contentList.forEach(it => {
+      if (it.type == 'number') {
+        it.content = 0
+      }
+    })
+    this.setData({
+      contentList,
+    })
     this.setData({
       formData: JSON.stringify({ accDate: new Date().toDateStr() })
     })
@@ -557,6 +566,15 @@ Page({
       events: {
         // 回调后
         refresh: function (data) {
+          let contentList = _this.data.contentList
+          contentList.forEach(it => {
+            if (it.type == 'number') {
+              it.content = 0
+            }
+          })
+          _this.setData({
+            contentList,
+          })
           _this.setData({
             formData: JSON.stringify({ accDate: new Date().toDateStr() })
           })

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

@@ -514,7 +514,13 @@ mixins: [mixins],
       } else if (this.data.formType == 7) {
         return this.excute(this.data.otherReceivableService, this.data.otherReceivableService.insert, this.data.params)
       } else if (this.data.formType == 8) {
-        return this.excute(this.data.orderService, this.data.orderService.insert, this.data.params);
+
+        if(this.data.params.updateFlag){
+          return this.excute(this.data.orderService, this.data.orderService.update, this.data.params);
+        }else{
+          return this.excute(this.data.orderService, this.data.orderService.insert, this.data.params);
+        }
+        
       } else if (this.data.formType == 9) {
         return this.excute(this.data.otherPayableService, this.data.otherPayableService.insert, this.data.params);
       }
@@ -539,6 +545,12 @@ mixins: [mixins],
         wx.navigateBack({
           delta: 1
         })
+      }else if(this.data.formType == 8 ){ //订单收款
+        let pages = getCurrentPages();
+        let prevPage = pages[pages.length - 2]; //上1页
+        prevPage.setData({
+          formData: true
+        })
       }
     },
     /**

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

@@ -17,7 +17,7 @@ Page({
    * 页面的初始数据
    */
   data: {
-    
+
     firstFlag: true,
     orderBy: [{
       "text": "可售量升序",
@@ -78,13 +78,13 @@ Page({
     contentList: []
   },
   selectedProduct(e) {
-    if(e.currentTarget.dataset.active == 0&&this.data.controlFlags&& this.data.controlFlags.choosewhFlag){
+    if (e.currentTarget.dataset.active == 0 && this.data.controlFlags && this.data.controlFlags.choosewhFlag) {
       this.setData({
         searchContent: [
-          { code: 'whId', title: mixins.$t('whName'), dropType: 'warehouse',searchType:'dropSingle' }, 
+          { code: 'whId', title: mixins.$t('whName'), dropType: 'warehouse', searchType: 'dropSingle' },
         ],
       })
-    }else{
+    } else {
       this.setData({
         searchContent: [],
       })
@@ -240,10 +240,10 @@ Page({
       //controlFlags.paramsByWhId 查询商品列表 是否开启顶部选择库区的 库区id 作为参数查询  
       //controlFlags.choosewhReadonly 顶部的选择库区是否可点击选择  直接用布尔值在xml控制了
       //controlFlags.chooseWhByUserDefault 顶部的选择库区是否选择用户默认的库区
-      if(controlFlags.choosewhFlag){
+      if (controlFlags.choosewhFlag) {
         this.setData({
           searchContent: [
-            { code: 'whId', title: mixins.$t('whName'), dropType: 'warehouse',searchType:'dropSingle' }, 
+            { code: 'whId', title: mixins.$t('whName'), dropType: 'warehouse', searchType: 'dropSingle' },
           ],
         })
       }
@@ -350,13 +350,29 @@ Page({
           element.skuImages.forEach(item => {
             item.url = config.image_url + item.path
           });
-          element.imagesUrl =   element.skuImages[0].url
-        } 
+          element.imagesUrl = element.skuImages[0].url
+        }
       })
       this.setData({
         tableData: tableData
       })
     }
+    if (this.data.billType == 'sale' || this.data.billType == 'saleOut' || this.data.billType == 'saleOutReturn') {
+      //处理图片
+      if (tableData && tableData.length > 0) {
+        tableData.forEach(item => {
+          if (item.skuImages && item.skuImages.value) {
+            item.skuImages.value = JSON.parse(item.skuImages.value)
+            console.log('item.skuImages.value', item.skuImages.value[0].url)
+            item['imagesUrl'] = item.skuImages.value.length > 0 ? item.skuImages.value[0].url : null
+          }
+        })
+        this.setData({
+          tableData: tableData
+        })
+      }
+    }
+
 
     if (this.data.controlFlags && this.data.controlFlags.sourcePage == "inventory-adjustment") { //库存调整 设置
       let popContent = this.data.popContent
@@ -380,7 +396,7 @@ Page({
           res.nonStdCode = ''
         })
       }
-   
+
       this.setData({
         popContent: popContent,
         tableData: tableData
@@ -447,10 +463,10 @@ Page({
         skuId: item.skuId,
         cpId: app.globalData.company.cpId,
         nonStdCode: item.nonStdCode,
-      }).then(it=>{
-        if(it.length > 0){
-          console.log('invId',it[0].invId)
-          console.log('invQty',it[0].invQty)
+      }).then(it => {
+        if (it.length > 0) {
+          console.log('invId', it[0].invId)
+          console.log('invQty', it[0].invQty)
           item.invId = it[0].invId
           item.invQty = it[0].invQty
           item.usableQty = it[0].usableQty
@@ -458,9 +474,9 @@ Page({
             dataItem: JSON.stringify(item)
           })
         }
-      
+
       })
-      console.log('item',item)
+      console.log('item', item)
     }
     if (this.data.item == Constants.billType.sale) {
       item.nonStdCode = item.nonStdCode ? item.nonStdCode : '-'

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

@@ -45,6 +45,7 @@
       <view wx:for="{{tableData}}" wx:key="index" border="{{ false }}" class="goods-cell-class" data-item="{{item}}" bind:tap="openAddItemInfo">
         <view class="goods-item-class">
           <view> 
+          
             <van-image radius="15rpx" custom-class="goods-item-image" fit="fill" src="{{item.imagesUrl}}" />
           </view>
           <view style="margin-left: 26rpx;width: 100%; ">
@@ -261,15 +262,15 @@
 
 
 
-<dk-popup wx:if="{{ billType != 'sale' && billType != 'saleOut' }}" type="sale"   descCol="skuName" titleTagCol="brandName" titleCol="skuModel" priceCol="pricePromotion" value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjName}}" priceTitle="参考价："  priceCol="pricePurchase" contentObj="{{popContent}}" bind:commit="editItems">
+<dk-popup wx:if="{{ billType != 'sale' && billType != 'saleOut' }}" type="sale"   descCol="skuName" titleTagCol="brandName" titleCol="skuModel" iconCol="imagesUrl" priceCol="pricePromotion" value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjName}}" priceTitle="参考价："  priceCol="pricePurchase" contentObj="{{popContent}}" bind:commit="editItems">
 </dk-popup>
 
 
 
-<dk-popup wx:if="{{ billType == 'sale' }}" type="sale" titleTagCol="brandName" subCol="skuCode" descCol="skuName" titleCol="skuModel" priceTitle="标价：" priceCol="priceStandard" value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjName}}" contentObj="{{popContent}}" bind:commit="editItems">
+<dk-popup wx:if="{{ billType == 'sale' }}" type="sale" titleTagCol="brandName" subCol="skuCode" descCol="skuName" titleCol="skuModel" priceTitle="标价：" iconCol="imagesUrl" priceCol="priceStandard" value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjName}}" contentObj="{{popContent}}" bind:commit="editItems">
 </dk-popup>
 
-<dk-popup wx:if="{{ billType == 'saleOut'}}" type="sale" titleTagCol="brandName" subCol="skuCode" descCol="skuName" titleCol="skuModel" priceTitle="标价：" priceCol="priceStandard" value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjName}}" contentObj="{{popContent}}" bind:commit="editItems" popupTopObj="{{popupTopObj}}">
+<dk-popup wx:if="{{ billType == 'saleOut'}}" type="sale" titleTagCol="brandName" subCol="skuCode" descCol="skuName" titleCol="skuModel" priceTitle="标价：" iconCol="imagesUrl" priceCol="priceStandard" value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjName}}" contentObj="{{popContent}}" bind:commit="editItems" popupTopObj="{{popupTopObj}}">
 </dk-popup>
 
 <dk-save-button  cssType="sale" model:value="{{btnFormData}}" btnAutoWidthFlag="{{false}}" btnRightFlag="{{true}}" buttonList="{{buttonList}}" contentList="{{contentList}}" bind:open="submit"></dk-save-button>

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

@@ -62,6 +62,8 @@ Page({
       ],
       '来源': [{ name: 'dataCode', title: mixins.$t('sourceCode') },
       ],
+      '盈亏原因': [{ name: 'dataCode', title: mixins.$t('profitLossCode') },
+    ],
     },
     popContent:
       [
@@ -189,7 +191,17 @@ Page({
           ]
 
       }
-
+      if (dictCode == mixins.$t('profitLossSys')) {
+        //设置新建编辑字段 客户来源
+        popContent =
+          [
+            { code: 'dataCode', type: 'str', title: mixins.$t('profitLossCode'), required: false, readonly: true, },
+            { code: 'dataValue', type: 'str', title: mixins.$t('profitLossName'), required: true },
+          ]
+          this.setData({
+            flgDefault: null
+          })
+      }
       popContent.push({ code: 'remarks', type: 'str', title: mixins.$t('remarks'), required: false })
     }
 

package-basic-data/pages/staff/detail/detail.js

@@ -67,15 +67,18 @@ Page({
    * @date : 2024/2/1 15:49
    * @author : 姜永辉
    */
-  setValuesByEdit(data) {
-    console.log("setValuesByEdit", data);
-    data.staffPhone = data.userPhone
-    data.staffName = data.userPhone
-    data.flgCanLogin = true
-    data.wxUserId = data.userId
-    this.setData({
-      formData: JSON.stringify(data)
-    })
+  handleSearchData(tableData) {
+    console.log("扫码页面的值:handleSearchData", tableData);
+    if (tableData != null && tableData.length > 0) {
+      let data = tableData[0] 
+      data.staffPhone = data.userPhone
+      data.staffName = data.userPhone
+      data.flgCanLogin = true
+      data.wxUserId = data.userId
+      this.setData({
+        formData: JSON.stringify(data)
+      })
+    }
   },
 
   /**
@@ -86,6 +89,7 @@ Page({
   setSearchParams(params) {
     // openid
     params.userWxid = this.data.formType
+    console.log("扫码页面的值setSearchParams", params);
     return params
   },
 
@@ -98,20 +102,4 @@ Page({
     return this.excute(this.data.oauthService, this.data.oauthService.wxByOpenId, params);
   },
 
-
-
-  /**
-  * 生命周期函数--监听页面加载
-  */
-  onLoad: function (options) {
-    console.log("扫码页面的值", options, this.data.formType);
-
-  },
-
-  /**
-    * 生命周期函数--监听页面显示
-    */
-  onShow: function () {
-  },
-
 })

package-inventory/pages/other-warehousing/other-warehousing.wxml

@@ -3,7 +3,7 @@
 
 <loading wx:if="{{loading}}"></loading>
 
-<dk-form-bill type="pur" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}" titleTagCol="shortName" titleCol="skuCode" subCol="skuCode" descCol="skuModel" priceCol="pricePur" quantityCol="itemQty" sumQuantityCol="itemQty" sumAmountCol="itemAmt" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" popType="sale" bind:editItems="setGoods" table="{{table}}"
+<dk-form-bill type="pur" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}" titleTagCol="shortName" titleCol="skuModel" descCol="skuName"   priceCol="pricePur" pupPriceCol="pricePurchase" iconCol="imagesUrl"  quantityCol="itemQty" sumQuantityCol="itemQty" sumAmountCol="itemAmt" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" popType="sale" bind:editItems="setGoods" table="{{table}}"
 bind:delItem="setGoods" bind:setGoods="setGoods">
 </dk-form-bill>
 <view style="height: 200rpx;"></view>

package-inventory/pages/outbound-processing/outbound-processing.js

@@ -145,9 +145,6 @@ Page({
         }],
         title: mixins.$t('cpManager')
       }, {
-        name: 'outObject',
-        title: mixins.$t('outObject')
-      }, {
         name: 'outDate',
         title: mixins.$t('outDate')
       }],

package-inventory/pages/warehousing-processing/detail/detail.js

@@ -122,20 +122,21 @@ Page({
         if (data.intoStatus == Constants.intoStatus.inBounded) {
             //查询采购订单表 未入库的 详细 
             this.setData({
+                readonly:true,
                 buttonList: [{
                     name: 'merge',
                     title: mixins.$t("close")
                 }],
             })
         } else {
+            readonly:false,
             this.setData({
                 buttonList: [{
                     name: 'merge',
                     title: mixins.$t("inProcessing")
                 }],
             })
-        }
-        console.log("sumitemAmt",data);
+        } 
         sumitemAmt =   Number(data.intoingAmt)
         sumitemquantity =   Number(data.intoingQty)
         cardList_.forEach(card => {

package-inventory/pages/warehousing-processing/warehousing-processing.js

@@ -137,9 +137,6 @@ Page({
         }],
         title: mixins.$t('cpManager')
       }, {
-        name: 'intoObject',
-        title: mixins.$t('inObject')
-      }, {
         name: 'intoDate',
         title: mixins.$t('intoDate')
       }],

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

@@ -188,16 +188,7 @@ Page({
     }
   },
 
-  /**
-* @desc :处理保存后续
-* @date : 2024/2/1 15:49
-* @author : 于继渤
-*/
-  handleData() {
-    wx.navigateBack({
-      data: 1
-    })
-  },
+
   //展开
   collapseFlagChange(e) {
     this.setData({

package-sales/pages/order-billing/add/add.js

@@ -243,10 +243,6 @@ Page({
         events: {
           // 回调后
           bindData: function (data) {
-            // 保存成功后 回调
-            wx.navigateBack({
-              data: 2
-            })
           }
         },
         success: function (res) {

package-sales/pages/order-billing/detail/detail.js

@@ -54,7 +54,7 @@ Page({
 
     //按钮
     buttonSaveList: [
-      { code: 'collection', title: '收款',plain:true }
+      { code: 'collection', title: '收款', plain: true }
     ],
     contentSaveList: [
       { code: 'need', title: '需收款', type: 'str' },
@@ -79,27 +79,29 @@ Page({
     cardList[0].sumStandard = data.data.sumStandard
     cardList[0].sumQuantity = data.data.sumQuantity
     cardList[0].saleDiscount = data.data.saleDiscount
-    contentSaveList[1]['content']  = data.data.sumAmount
+    contentSaveList[1]['content'] = data.data.amtResidue
+
 
-    
     this.setData({
       item: data.data,
-      contentSaveList:contentSaveList,
+      contentSaveList: contentSaveList,
       formData: JSON.stringify(formData),
       cardList: cardList
     })
   },
 
-  saveButton(){
+  saveButton() {
     let formData = JSON.parse(this.data.formData)
     let item = {}
-    item.objInfo = {}
-    item.objInfo['cusPhone'] = formData.cusPhone
-    item.objInfo['cusName'] = formData.cusName
-    item.objInfo['objectId'] = formData.cusId
-    item.objInfo['addressFull'] = formData.addressFull
-
-
+    formData.objInfo = {}
+    formData.objInfo['cusPhone'] = formData.cusPhone
+    formData.objInfo['cusName'] = formData.cusName
+    formData.objInfo['objectId'] = formData.cusId
+    formData.objInfo['addressFull'] = formData.addressFull
+    formData.sumAmount = formData.amtResidue
+    formData.deleteItemList = []
+    formData.itemList = formData.goodsList
+    formData.updateFlag = true
     let _this = this
     wx.navigateTo({
       url: this.data.route.selectCollectionConfirm.url,
@@ -115,7 +117,7 @@ Page({
       success: function (res) {
         //设置参数
         //let item = _this.setSaveData()
-        res.eventChannel.emit('params', { item: JSON.stringify(item), formType: 8 })
+        res.eventChannel.emit('params', { item: JSON.stringify(formData), formType: 8 })
       }
     })
   },
@@ -130,28 +132,28 @@ Page({
     return this.excute(this.data.service, this.data.service.getOrderForUpdate + '/' + this.data.item.orderId, params);
   },
 
-   /**
-     * @desc : 详细页面 （编辑）
-     * @date : 2024/2/1 15:49
-     * @author : 于继渤
-     */
-    toEdit(e) {
-      let formData = JSON.parse(this.data.formData)
-      let orderId = formData.orderId
-      let that = this
-      wx.navigateTo({
-          url: this.data.route.add.url,
-          events: {
-              // 回调后，在这里给页面赋值
-              bandData: function (e) { 
-              }
-          },
-          success: function (res) {
-              res.eventChannel.emit('params', {
-                  id: orderId,
-                  formMode: Constants.formMode.edit
-              })
-          }
-      })
+  /**
+    * @desc : 详细页面 （编辑）
+    * @date : 2024/2/1 15:49
+    * @author : 于继渤
+    */
+  toEdit(e) {
+    let formData = JSON.parse(this.data.formData)
+    let orderId = formData.orderId
+    let that = this
+    wx.navigateTo({
+      url: this.data.route.add.url,
+      events: {
+        // 回调后，在这里给页面赋值
+        bandData: function (e) {
+        }
+      },
+      success: function (res) {
+        res.eventChannel.emit('params', {
+          id: orderId,
+          formMode: Constants.formMode.edit
+        })
+      }
+    })
   },
 })

package-sales/pages/order-billing/detail/detail.wxml

@@ -6,7 +6,7 @@
   <view class="tags-class">
 
     <view style="width: 33%;text-align: right;">
-      <dk-tag fontSize="14px" border="1rpx solid #95A8CB" height="45rpx" color="transparent" textColor="#002340" radius="10rpx" roundFlag="{{true}}" size="medium" value="{{'未收款'}}"></dk-tag>
+      <dk-tag fontSize="14px" border="1rpx solid #95A8CB" height="45rpx" color="transparent" textColor="#002340" radius="10rpx" roundFlag="{{true}}" size="medium" value="{{(item.amtFactReceipt < item.sumAmount &&  item.amtFactReceipt > 0)? (item.amtFactReceipt == item.sumAmount ? '已收款':'部分收款')  : '未收款'}}"></dk-tag>
     </view>
     <view style="width: 33%;text-align: center;">
       <dk-tag fontSize="14px" border="1rpx solid #95A8CB" height="45rpx" color="transparent" textColor="#002340" radius="10rpx" roundFlag="{{true}}" size="medium" value="{{item.returnQty > 0? '有退货' : '无退货'}}"></dk-tag>

package-sales/pages/order-return/add/add.js

@@ -57,11 +57,10 @@ Page({
     },
     //按钮
     buttonSaveList: [
-      { code: 'collection', title: mixins.$t("collection"), plain: true },
       { code: 'save', title: mixins.$t("save") }
     ],
     contentSaveList: [
-      { code: 'flag', title: mixins.$t("saleOutBoundFlag"), type: 'checkbox' },
+      { code: 'flag', title: mixins.$t("autoSaleOutBoundFlag"), type: 'checkbox' },
       { code: 'need', title: mixins.$t("saleCollection"), type: 'str' },
       { code: 'receivable', content: 0, type: 'number' }
     ],
@@ -306,11 +305,12 @@ Page({
   setParams(params) {
     let itemIndex = 0
     console.log('params1', params)
+    params.fromId = params.orderId
     params.goodsList.forEach(res => {
-      res['sOutId'] = res.soutId
-      res['sOutItemId'] = res.soutItemId
-      res['sOrderItemId'] = res.sorderItemId
-      res['sOrderId'] = res.sorderId
+      // res['sOutId'] = res.soutId
+      // res['sOutItemId'] = res.soutItemId
+      // res['sOrderItemId'] = res.sorderItemId
+      // res['sOrderId'] = res.sorderId
       res.itemIndex = itemIndex++
       res.canNegativeFlag = true
       if (this.data.formMode != 'detail') {
@@ -529,7 +529,7 @@ Page({
       //标价合计 =  商品标价 x  商品数量
       sumStandard += item.amtStd
       sumAmount += item.outingQty * item.priceOut //没有售价默认取标价
-      sumQuantity += item.orderQty //数量
+      sumQuantity += item.outingQty //数量
     })
     formData.sumStandard = sumStandard
     formData.saleDiscount = Number((sumAmount / sumStandard) * 100).toFixed(2)
@@ -537,6 +537,8 @@ Page({
     formData.canUseCollect = 0
     formData.useCollect = 0
     formData.sumQuantity = sumQuantity
+    formData.outingQty = sumQuantity * -1
+    formData.outingAmt = sumAmount
     let cardList = this.data.cardList
     let contentSaveList = this.data.contentSaveList
     cardList[2].sumAmount = formData.sumAmount

package-sales/pages/order-return/order-return.js

@@ -203,8 +203,8 @@ Page({
     let outAmt = Number(0)
     let outQty = Number(0)
     tableData.forEach(res => {
-      outAmt += res.outAmt
-      outQty += res.outQty
+      outAmt += res.sumOutAmt
+      outQty += res.sumOutQty
     })
     contentSaveList[1].content = outAmt
     contentSaveList[1].bill = tableData.length