Revert "fix bug"

This reverts commit d2098dab1b.

sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysSmsServiceImpl.java

@@ -8,9 +8,7 @@ import com.bonus.sgzb.common.core.exception.ServiceException;
 import com.bonus.sgzb.common.core.utils.GlobalConstants;
 import com.bonus.sgzb.common.core.web.domain.AjaxResult;
 import com.bonus.sgzb.common.redis.service.RedisService;
-import com.bonus.sgzb.system.api.domain.SysUser;
 import com.bonus.sgzb.system.config.TencentSmsConfig;
-import com.bonus.sgzb.system.mapper.SysUserMapper;
 import com.bonus.sgzb.system.service.ISysSmsService;
 import com.tencentcloudapi.common.Credential;
 import com.tencentcloudapi.common.exception.TencentCloudSDKException;
@@ -45,8 +43,6 @@ public class SysSmsServiceImpl implements ISysSmsService {
 
     @Resource
     private RedisService redisService;
-    @Resource
-    private SysUserMapper sysUserMapper;
 
     @Resource
     private TencentSmsConfig tencentSmsConfig;
@@ -59,7 +55,6 @@ public class SysSmsServiceImpl implements ISysSmsService {
 
     /**
      * 验收通知短信
-     *
      * @param phone 手机号
      * @param msg   内容
      * @return
@@ -79,12 +74,11 @@ public class SysSmsServiceImpl implements ISysSmsService {
         } catch (Exception e) {
             return AjaxResult.error("发送失败:" + e.getMessage());
         }*/
-        return sendMsgByPhone(phone, msg);
+        return sendMsgByPhone( phone,  msg);
     }
 
     /**
      * 登录短信验证码
-     *
      * @param phone 手机号
      * @return
      */
@@ -102,13 +96,12 @@ public class SysSmsServiceImpl implements ISysSmsService {
         } catch (Exception e) {
             return AjaxResult.error("发送失败:" + e.getMessage());
         }*/
-        return sendCodeByPhone(phone, null);
+        return  sendCodeByPhone(phone,null);
     }
 
 
     /**
      * 发送消息msg到手机
-     *
      * @param phone 手机号码
      * @return AjaxResult对象
      */
@@ -135,7 +128,6 @@ public class SysSmsServiceImpl implements ISysSmsService {
 
     /**
      * 发送验证码到手机
-     *
      * @param phone 手机号码
      * @return AjaxResult对象
      */
@@ -144,11 +136,6 @@ public class SysSmsServiceImpl implements ISysSmsService {
         if (phone == null || phone.length() != UserConstants.PHONE_DEFAULT_LENGTH_LOGIN) {
             return AjaxResult.error("手机号格式错误，请输入11位数字号码");
         }
-        // 校验是否存在该手机号
-        SysUser sysUser = sysUserMapper.checkPhoneUnique(phone);
-        if (sysUser == null) {
-            return AjaxResult.error("该手机号未绑定用户，请重新确认");
-        }
         String code = getSixBitCode();
         // 校验验证码
         if (code.length() != UserConstants.CODE_MIN_LENGTH_LOGIN) {
@@ -164,8 +151,7 @@ public class SysSmsServiceImpl implements ISysSmsService {
             }
             // 存储验证码至Redis中，键值为：code_15588886157 , 有效期5，时间颗粒度为MINUTES:分钟
             redisService.setCacheObject("code_" + phone, code, 5L, TimeUnit.MINUTES);
-//            return success("手机号：" + phone + "，用户登录验证码：" + code + "，返回结果：" + body);
+            return success("手机号：" + phone + "，用户登录验证码：" + code + "，返回结果：" + body);
-            return success("验证码发送成功:" + body);
         } catch (Exception e) {
             return AjaxResult.error("发送失败:" + e.getMessage());
         }
@@ -209,16 +195,15 @@ public class SysSmsServiceImpl implements ISysSmsService {
 
     /**
      * 腾讯sms短信
-     *
      * @param mobilePhone
      * @param templateId
      * @param args
      * @return
      * @throws Exception
      */
-    public String sendMessageNew(String mobilePhone, String templateId, String... args) throws Exception {
+    public String sendMessageNew(String mobilePhone,String templateId, String... args) throws Exception {
 
-        try {
+        try{
             // 实例化一个认证对象，入参需要传入腾讯云账户secretId，secretKey,此处还需注意密钥对的保密
             Credential cred = new Credential(tencentSmsConfig.getAccessKeyId(), tencentSmsConfig.getAccessKeySecret());
             // 实例化一个http选项，可选的，没有特殊需求可以跳过
@@ -242,7 +227,7 @@ public class SysSmsServiceImpl implements ISysSmsService {
                 phoneNumberSet1[i] = "+86" + phoneNumberSet1[i];
             }
             req.setPhoneNumberSet(phoneNumberSet1);//发送的手机号
-            if (null != args && args.length > 0 && Arrays.stream(args)
+            if(null != args && args.length > 0 && Arrays.stream(args)
                     .noneMatch(s -> s == null || s.trim().isEmpty())) {
                 String[] templateParamSet1 = args;//模板的参数
                 req.setTemplateParamSet(templateParamSet1);//发送验证码
@@ -254,19 +239,19 @@ public class SysSmsServiceImpl implements ISysSmsService {
             log.info("腾讯云平台短信发送响应结果：{}", JSONObject.toJSONString(resp));
             SendStatus[] sendStatusSet = resp.getSendStatusSet();
             List<SendStatus> sendStatuses = Arrays.asList(sendStatusSet);
-            if (CollectionUtils.isNotEmpty(sendStatuses)) {
+            if (CollectionUtils.isNotEmpty(sendStatuses)){
                 for (SendStatus sendStatus : sendStatuses) {
-                    if (!"OK".equalsIgnoreCase(sendStatus.getCode())) {
+                    if (!"OK".equalsIgnoreCase(sendStatus.getCode())){
-                        throw new ServiceException(sendStatus.getMessage(), Integer.valueOf(sendStatus.getCode()));
+                        throw new ServiceException(sendStatus.getMessage(),Integer.valueOf(sendStatus.getCode()));
                     }
                 }
             }
 
-            return resp.getRequestId();
+             return  resp.getRequestId();
         } catch (TencentCloudSDKException e) {
             e.printStackTrace();
             log.error("短信发送失败：{}", e.getMessage());
-            throw new ServiceException(e.getMessage(), Integer.valueOf(e.getErrorCode()));
+            throw new ServiceException(e.getMessage(),Integer.valueOf(e.getErrorCode()));
         }
     }
 }

sgzb-ui/src/views/claimAndreturn/picking/apply/component/AddPicking1.vue

@@ -598,7 +598,7 @@ export default {
                 this.queryParams.examineStatusId = '32'
             }
             this.queryParams.unitId = data.unitId
-            this.queryParams.costBearingParty = data.costBearingParty
+            this.queryParams.costBearingParty = data?.costBearingParty
             this.queryParams.proId = data.proId
             this.queryParams.leaseApplyInfo.phone =
                 data.leaseApplyInfoList[0].phone
@@ -633,7 +633,7 @@ export default {
             }
             this.queryParams.unitId = data.unitId
             this.queryParams.proId = data.proId
-            this.queryParams.costBearingParty = data.costBearingParty
+            this.queryParams.costBearingParty = data?.costBearingParty
             this.queryParams.leaseApplyInfo.phone =
                 data.leaseApplyInfoList[0].phone
             this.queryParams.leaseApplyInfo.leasePerson =
@@ -889,3 +889,4 @@ export default {
     },
 }
 </script>
+

sgzb-ui/src/views/repairTest/repair/dialogOneForm.vue

@@ -100,7 +100,7 @@
                         <el-form-item
                             v-if="domain.partType == 1"
                             :prop="'premiumList.' + index + '.partCost'"
-                            label="配件单价："
+                            label="配件费用："
                             :rules="{
                                 required: false,
                                 validator: meneyIntegerValidator,
@@ -267,9 +267,8 @@
                             ></el-input>
                         </el-form-item>
                         <el-form-item
-                            v-if="domain.partType == 1"
                             :prop="'premiumListTwo.' + index + '.partCost'"
-                            label="配件单价："
+                            label="配件费用："
                             :rules="{
                                 required: false,
                                 validator: meneyIntegerValidator,

sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/codingTools.vue

@@ -791,8 +791,7 @@ export default {
             this.$tab.closeOpenPage(obj)
         },
         async handleBindDetails(row) {
-            console.log('🚀 ~ handleBindDetails ~ row:', row.taskId, row)
+            console.log('🚀 ~ handleBindDetails ~ row:', row.taskId)
-            this.surplusNoBindNum = row.checkNum - row.bindNum
             this.open = true
             this.isDetail = true
             this.title = '编码绑定详情'

sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/home.vue

@@ -558,6 +558,7 @@ export default {
             //     .then(() => {
             //         this.$tab.refreshPage()
             //     })
+
             this.$emit('queryTools', row.taskId)
         },
         /** 修改按钮操作 */

sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/queryTools.vue

@@ -190,7 +190,6 @@
                     >
                         验收
                     </el-button>
-
                     <!-- <el-button
               size="mini"
               type="text"

sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/index.vue

@@ -71,7 +71,6 @@ export default {
         /* 查询工机具 */
         queryTools(taskId) {
             this.isView = true
-
             this.pageContent = '详情信息'
             this.queryTaskId = taskId
             this.isShowComponent = 'QueryTools'

sgzb-ui/src/views/warehouseManage/warehousing/newParts/index.vue

@@ -306,21 +306,18 @@
                     </el-select>
         </el-form-item>-->
 
-                <el-form-item label="配件类型" prop="typeId">
+                <el-form-item label="机具类型" prop="typeId">
-                    <el-select
+                    <treeselect
                         v-model="query.typeId"
-                        placeholder="请选择配件类型"
+                        default-expand-all
-                        clearable
+                        :options="equipmentTypeList"
-                        filterable
+                        placeholder="请选择规格型号"
+                        :disable-branch-nodes="true"
                         style="width: 240px"
-                    >
+                        noChildrenText="没有数据了"
-                        <el-option
+                        noOptionsText="没有数据"
-                            v-for="typeItem in typeList"
+                        noResultsText="没有搜索结果"
-                            :key="typeItem.partId"
+                    />
-                            :label="typeItem.partName"
-                            :value="typeItem.partId"
-                        />
-                    </el-select>
                 </el-form-item>
                 <el-form-item>
                     <el-button
@@ -470,13 +467,9 @@
         </el-dialog>
 
         <!-- 入库单弹窗 -->
-        <el-dialog :visible.sync="openPrint" width="80%" append-to-body>
+        <el-dialog :visible.sync="openPrint" width="900px" append-to-body>
-            <div>
+            <div style="height: 400px; overflow-y: scroll">
-                <vue-easy-print
+                <vue-easy-print tableShow ref="remarksPrintRef" class="print">
-                    tableShow
-                    ref="remarksPrintRef"
-                    class="print print-content"
-                >
                     <div
                         class="title"
                         style="
@@ -535,7 +528,16 @@
               <span>车辆信息：</span>
             </div> -->
                     </div>
-                    <el-table :data="printTableData" class="table">
+                    <el-table
+                        :data="printTableData"
+                        class="table"
+                        style="
+                            margin-top: 20px;
+                            padding-bottom: 1px;
+                            padding-right: 1px;
+                        "
+                        border
+                    >
                         <!--          <el-table-column type="selection" width="55" align="center" />-->
                         <el-table-column
                             label="序号"

sgzb-ui/src/views/warehouseManage/warehousing/newTools/index.vue

@@ -713,7 +713,6 @@ export default {
                 maCode: row.maCode,
                 typeId: row.typeId,
                 num: row.num,
-                manageType: row.manageType,
             }
 
             let param = {
@@ -767,7 +766,6 @@ export default {
                 maCode: row.maCode,
                 inputNum: row.checkNum,
                 typeId: row.typeId,
-                manageType: row.manageType,
             }
 
             let param = {

sgzb-ui/vue.config.js

@@ -42,11 +42,11 @@ module.exports = {
         // target: `https://test-cc.zhgkxt.com`,//线上环境-南网
         // target: `https://z.csgmall.com.cn`,
 
-        // target: `http://192.168.2.154:39080`, //超
+        target: `http://192.168.2.154:39080`, //超
         // target: `http://10.40.92.81:8080`, //韩/
         // target: `http://10.40.92.74:8080`,//旭/
         // target: `http://10.40.92.138:28080`, //帅
-        target: `http://192.168.2.216:39080`, //福
+        // target: `http://10.40.92.253:28080`, //福
         // target: `http://192.168.2.120:39080`, //跃
 
         //******** 注意事项  ********* */