Merge branch 'xf_dev' of http://192.168.1.4:3000/jiaxiaoqiang/JG-ADMIN-TEMP into xf_dev

.env.development

@@ -11,6 +11,6 @@ VITE_APP_BASE_API = '/dev-api'
 VITE_APP_UPLOAD_URL = 'http://192.168.101.4:9000'
 # 开发接口地址
 #VITE_APP_API_URL = 'http://192.168.101.4:8078'
-VITE_APP_API_URL = 'http://10.88.11.200:8078'
+VITE_APP_API_URL = 'http://127.0.0.1:8078'
 # 是否启用 Mock 服务
 VITE_MOCK_DEV_SERVER = false

docker/Dockerfile_xf

@@ -12,14 +12,14 @@ RUN echo "server {  \
                       gzip_vary on;\
                       client_max_body_size 100m;\
                       location   /mes-server/ { \
-                      proxy_pass              http://139.155.176.112:8078/; \
+                      proxy_pass              http://192.168.1.4:8078/; \
                       proxy_redirect          off; \
                       proxy_set_header        Host mes-server; \
                       proxy_set_header        X-Real-IP \$remote_addr; \
                       proxy_set_header        X-Forwarded-For \$proxy_add_x_forwarded_for; \
                   } \
                   location /jgfile/ { \
-                              proxy_pass          http://139.155.176.112:19000/jgfile/; \
+                              proxy_pass          http://192.168.1.4:9000/jgfile/; \
                               proxy_redirect      off; \
                               proxy_set_header    Host jgfile; \
                               proxy_set_header    X-Real-IP \$remote_addr; \

src/views/plan/requisition/index.vue

@@ -533,7 +533,13 @@ const { checkBtnPerm, downloadTemplate, exportData } = Utils; //按钮权限等
 const { username } = useUserStoreHook().user;
 const minusItem = (row) => {
   tableDataList.value = tableDataList.value.filter(
-    (item) => item.id !== row.id
+    (item) => {
+      if(row.id){
+        return item.id !== row.id
+      }else{
+        return item.materialCode !== row.materialCode
+      }
+    }
   );
 };
 const changeOrder = (val) => {

src/views/plan/workOrder/components/work-order-seq.vue

@@ -71,7 +71,7 @@
       <div style="display: flex;flex-wrap: wrap;" ref="toPrintRef">
         <div v-for="item of clickObjs" style="width: 238px;overflow: hidden;font-size:10px;">
           <div style="float: left;padding-bottom: 30px">
-          <vue-qrcode  :value="item.seqNo"  size="45" error-level="H"></vue-qrcode>
+          <vue-qrcode  :value="item.code"  size="45" error-level="H"></vue-qrcode>
 
           <div>
             <el-text>{{item.seqNo}}</el-text>
@@ -137,6 +137,7 @@ const selectionChange1 =(row)=>{
   toDeleteIds.value = [];
   row?.forEach((element) => {
     toDeleteIds.value.push(element.id);
+    element.code = ";BM" +info.value.engineeringCode+ ";MC"+ info.value.materialName + ";SL1;SN"+element.seqNo+";PH" + info.value.workOrderCode+";"
   });
   clickObjs.value = row
 }