Pārlūkot izejas kodu

fix:"优化远程制作"

soobin 4 mēneši atpakaļ
vecāks
revīzija
df9de74979

+ 1 - 1
src/service/device/index.js

@@ -69,7 +69,7 @@ export function selectProducts(params) {
 
 // 远程做糖
 export function doSugar(params) {
-    return axios.get(`/SZWL-SERVER/tSugarDo/doSugar?${stringToUrl(params)}`);
+    return axios.post(`/SZWL-SERVER/tSugarDo/doSugar`, params);
 }
 
 // 查询做糖状态

+ 2 - 2
src/views/device/doSugar.vue

@@ -258,8 +258,8 @@ export default {
         title: t('user.tips'),
         message: t('device.confirmMake')+ fieldValue.value +'?',
       }).then(async() => {
-        const { data } = await doSugar({ equipmentId: deviceId, productName: fieldValue.value, makeCodes: makeCodes.value });
-        if (data.code) {
+        const { data } = await doSugar({ equipmentId: deviceId, productName: fieldValue.value, makeCodes: makeCodes.value.join(',') });
+        if (data.code == "00000") {
           doSugartData.value = data.data;
           setTimeout(() => {
             doSugartType.value = false;

+ 9 - 4
src/views/settlement/index.vue

@@ -55,7 +55,9 @@
           <div class="van-cell van-field requiredLeft">
             <div class="van-cell__title van-field__label"><span>结算方式</span></div>
             <div class="van-cell__value van-field__value radioBox">
-              <van-radio-group v-model="settMode" direction="horizontal" @change="fieldUpdate">
+              <van-radio-group
+                :disabled="huifuMchNO == null || joinPayMchID == null || huifuMchNO == ''"
+                v-model="settMode" direction="horizontal" @change="fieldUpdate">
                 <van-radio :name="1" icon-size="18px">自动结算</van-radio>
                 <van-radio :name="2" icon-size="18px">手动提现</van-radio>
               </van-radio-group>
@@ -679,7 +681,7 @@ export default {
       huifuParams.regProvId = selectedOptions[0]?.value || '';
       huifuParams.regAreaId = selectedOptions[1]?.value || '';
       huifuParams.regDistrictId = selectedOptions[2]?.value || '';
-      huifuParams.regDetail = addParams.registeredAddress;
+      huifuParams.regDetail = registeredAddress.value;
       fieldUpdate();
     };
     onMounted(async () => {
@@ -782,9 +784,11 @@ export default {
           addParams.validityType = data.data.certValidityType;
           if (data.data.certBeginDate != null && data.data.certBeginDate != "") {
             beginDate.value = dateUtil.formatDate(data.data.certBeginDate);
+            huifuParams.certBeginDate = data.data.certBeginDate;
           }
           if (data.data.certEndDate != null && data.data.certEndDate != "") {
             endDate.value = dateUtil.formatDate(data.data.certEndDate);
+            huifuParams.certEndDate = data.data.certEndDate;
           }
           huifuParams.cardProvId = data.data.cardProvId;
           huifuParams.cardAreaId = data.data.cardAreaId;
@@ -815,9 +819,11 @@ export default {
             addParams.validityType1 = data.data.licenseValidityType;
             if (data.data.licenseBeginDate != null && data.data.licenseBeginDate != "") {
               beginDateLicense.value = dateUtil.formatDate(data.data.licenseBeginDate);
+              huifuParams.licenseBeginDate = data.data.licenseBeginDate;
             }
             if (data.data.licenseEndDate != null && data.data.licenseEndDate != "") {
               endDateLicense.value = dateUtil.formatDate(data.data.licenseEndDate);
+              huifuParams.licenseEndDate = data.data.licenseEndDate;
             }
             if (data.data.licensePic != null && data.data.certBackPic != null && data.data.certFrontPic != null && data.data.regAcctPic != null) {
               huifuPicUpStatus.value = 1;
@@ -903,8 +909,7 @@ export default {
         huifuParams.regName = addParams.regNameValue;
         huifuParams.licenseCode = addParams.licenseNo;
         huifuParams.licenseValidityType = addParams.validityType1;
-
-        huifuParams.regDetail = addParams.registeredAddress;
+        huifuParams.regDetail = registeredAddress.value;
         if (addParams.bankAccountType === '4') {
           huifuParams.cardType = '0';
           huifuParams.branchCode = addParams.bankChannelNo;