Merge remote-tracking branch 'origin/master'

# Conflicts:
#	zkqy-framework/src/main/java/com/zkqy/framework/sso_oauth2/controller/ThirdPartLoginController.java
#	zkqy-ui/src/views/login.vue
#	zkqy-ui/vue.config.js

zkqy-admin/src/main/resources/application.yml

@@ -192,10 +192,10 @@ projectDownloadZip:
 OpenAuthorization2:
   MES:
     # 单点获取code、token、userinfo主机地址
-    URL: http://192.168.110.114:8066/oauth2
+    URL: http://192.168.110.129:8066/oauth2
     # 系统标识
     BASIC: mes
     # 重定向本系统主机地址
-    REDIRECT_URL: http://192.168.110.114:1025
+    REDIRECT_URL: http://192.168.110.129:1025
     # 回调地址
-    CALLBACK: http://192.168.110.114:8066/oauth/callback
+    CALLBACK: http://192.168.110.129:8066/oauth/callback

zkqy-framework/src/main/java/com/zkqy/framework/sso_oauth2/controller/ThirdPartLoginController.java

@@ -5,10 +5,7 @@ import com.alibaba.fastjson2.JSONObject;
 import com.zkqy.common.annotation.Anonymous;
 import com.zkqy.common.core.domain.AjaxResult;
 import com.zkqy.common.core.domain.entity.SysUser;
-import com.zkqy.common.core.domain.model.LoginBody;
-import com.zkqy.common.utils.StringUtils;
 import com.zkqy.common.utils.http.HttpUtilsOauth2;
-import com.zkqy.system.service.ISysUserService;
 import org.apache.http.HttpResponse;
 import org.apache.http.util.EntityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,7 +21,6 @@ import java.nio.charset.StandardCharsets;
 import java.util.Base64;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Optional;
 
 
 /**

zkqy-ui/.env.development

@@ -17,7 +17,7 @@ VUE_CLI_BABEL_TRANSPILE_MODULES = true
 # VUE_APP_BASE_API1 = 'http://192.168.110.15:8066/'
 # VUE_APP_BASE_API1 = 'http://192.168.110.120:8066/'
 # VUE_APP_BASE_API1 = 'http://192.168.110.76:8066/'
-VUE_APP_BASE_API1 = 'http://192.168.110.83:8066/'
+VUE_APP_BASE_API1 = 'http://192.168.110.129:8066/'
 
 # ws地址
 VUE_APP_BASE_WS_API = '//192.168.110.15:8721'

zkqy-ui/src/views/orderMange/requisitionOrders/index.vue

@@ -167,12 +167,12 @@
                 @pagination="getList"/>
 
     <!-- 添加或修改领料单对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body :before-close="cancel">
+    <el-dialog :title="requistionOrdersType?'退料单':'领料单'" :visible.sync="open" width="800px" append-to-body :before-close="cancel">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row :gutter="20">
           <el-col :span="8">
             <el-form-item label="单据类型" prop="requistionOrdersType">
-              <el-select v-model="form.requistionOrdersType" filterable placeholder="请选择任务领料"
+              <el-select v-model="form.requistionOrdersType" filterable placeholder="请选择任务"
                          :disabled="requistionState" @change="handleRequistionState(form.requistionOrdersType)">
                 <el-option key="0" label="领料" :value=0></el-option>
                 <el-option key="1" label="退料" :value=1></el-option>
@@ -180,8 +180,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="领料任务" prop="taskCode">
-              <el-select v-model="form.taskCode" filterable placeholder="请选择任务领料" :disabled="requistionState"
+            <el-form-item :label="requistionOrdersType?'退料任务':'领料任务'" prop="taskCode">
+              <el-select v-model="form.taskCode" filterable placeholder="请选择任务" :disabled="requistionState"
                          @change="handleRequistionState(form.requistionOrdersType)">
                 <el-option v-for="item in taskList" :key="item.saleProductsId" :label="item.saleProductsTaskName"
                            :value="item.saleProductsId"></el-option>
@@ -189,7 +189,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="领料日期" prop="requisitionDate">
+            <el-form-item :label="requistionOrdersType?'退料日期':'领料日期'" prop="requisitionDate">
               <el-date-picker style="width: 100%" v-model="form.requisitionDate" type="date"
                               value-format="yyyy-MM-dd" placeholder="请选择领料日期"
                               :disabled="requistionState"></el-date-picker>
@@ -442,7 +442,9 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
+      //console.log(row)
       this.reset();
+      this.requistionOrdersType = row.requistionOrdersType;
       const id = row.id || this.ids
       // 获取领料任务
       this.getTaskList();