Merge branch 'master' into develop

Dockerfile

@@ -1,5 +1,6 @@
 # 基础镜像
-FROM nginx:1.22
+#FROM nginx:1.22
+FROM nginx
 
 # 复制 nginx 配置文件
 COPY ./nginx.conf /etc/nginx/nginx.conf

nginx.conf

@@ -37,49 +37,49 @@ http {
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header REMOTE-HOST $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_pass http://172.18.0.10:8040/;
+        proxy_pass http://172.18.0.1:8040/;
     }
     location /ezhizao-yzbh-sys/{
         proxy_set_header Host $http_host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header REMOTE-HOST $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_pass http://172.18.0.10:8040/;
+        proxy_pass http://172.18.0.1:8040/;
     }
     location /ezhizao-yzbh-crm/{
         proxy_set_header Host $http_host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header REMOTE-HOST $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_pass http://172.18.0.6:8041/;
+        proxy_pass http://172.18.0.1:8041/;
     }
     location /ezhizao-yzbh-entrust/{
         proxy_set_header Host $http_host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header REMOTE-HOST $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_pass http://172.18.0.7:8042/;
+        proxy_pass http://172.18.0.1:8042/;
     }
     location /ezhizao-yzbh-production/{
         proxy_set_header Host $http_host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header REMOTE-HOST $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_pass http://172.18.0.9:8043/;
+        proxy_pass http://172.18.0.1:8043/;
     }
     location /ezhizao-yzbh-finance/{
         proxy_set_header Host $http_host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header REMOTE-HOST $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_pass http://172.18.0.9:8043/;
+        proxy_pass http://172.18.0.1:8043/;
     }
     location /ezhizao-yzbh-financial/{
         proxy_set_header Host $http_host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header REMOTE-HOST $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_pass http://172.18.0.8:8044/;
+        proxy_pass http://172.18.0.1:8044/;
     }
     error_page   500 502 503 504  /50x.html;
     location = /50x.html {

src/views/business/production/salary/form.vue

@@ -495,6 +495,13 @@ function open(detail) {
 function loadData() {
   getDetail(form.value).then((res) => {
     form.value = { ...proxy.deepClone(emptyForm), ...res.data };
+    res.data.details.forEach(item =>{
+      form.value.details.forEach(item2 =>{
+        if(item.employeeName == item2.employeeName ){
+          item2.currentIndividualIncomeTax = item.individualIncomeTaxConfirm;
+        }
+      })
+    })
     if (form.value.status === 2 || form.value.status === 3) {
       proxy.$modal.msgError("该工资信息已提交待审核");
       close();