cz 1 год назад
Родитель
Сommit
a788137cfa

+ 1 - 1
.env.development

@@ -1,5 +1,5 @@
 # 页面标题
-VITE_APP_TITLE = ByteSailing
+VITE_APP_TITLE = 嘉兴双拓
 
 # 开发环境配置
 VITE_APP_ENV = 'development'

+ 1 - 1
.env.production

@@ -1,5 +1,5 @@
 # 页面标题
-VITE_APP_TITLE = ByteSailing
+VITE_APP_TITLE = 嘉兴双拓
 
 # 生产环境配置
 VITE_APP_ENV = 'production'

+ 1 - 1
.env.staging

@@ -1,5 +1,5 @@
 # 页面标题
-VITE_APP_TITLE = ByteSailing
+VITE_APP_TITLE = 嘉兴双拓
 
 # 生产环境配置
 VITE_APP_ENV = 'staging'

+ 1 - 1
index.html

@@ -7,7 +7,7 @@
   <meta name="renderer" content="webkit">
   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
   <link rel="icon" href="/favicon.ico">
-  <title>ByteSailing</title>
+  <title>嘉兴双拓</title>
   <!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
   <style>
     html,

+ 2 - 2
package.json

@@ -1,8 +1,8 @@
 {
   "name": "ruoyi",
   "version": "3.8.5",
-  "description": "ByteSailing",
-  "author": "ByteSailing",
+  "description": "嘉兴双拓",
+  "author": "嘉兴双拓",
   "license": "MIT",
   "scripts": {
     "dev": "vite",

+ 1 - 1
src/assets/icons/iconfont/iconfont.json

@@ -1,6 +1,6 @@
 {
   "id": "3933484",
-  "name": "ByteSailing",
+  "name": "嘉兴双拓",
   "font_family": "iconfont",
   "css_prefix_text": "icon-",
   "description": "",

+ 1 - 1
src/components/headerBar/header-bar.vue

@@ -2,7 +2,7 @@
   <div id="main" class="header-bar" @click="isChildMenu = false">
     <header>
       <ul class="nav">
-        <!-- <div class="logo">ByteSailing</div> -->
+        <!-- <div class="logo">嘉兴双拓</div> -->
         <div class="logo" style="display: flex; align-items: center; justify-content: center">
           <img v-if="!logoUrl" :src="'/img/logo2.png'" />
           <el-image v-else style="width: 120px; height: 30px" :src="logoUrl" fit="scale-down" />

+ 1 - 1
src/layout/components/Sidebar/Logo.vue

@@ -25,7 +25,7 @@ defineProps({
   }
 })
 
-const title = ref('ByteSailing');
+const title = ref('嘉兴双拓');
 const settingsStore = useSettingsStore();
 const sideTheme = computed(() => settingsStore.sideTheme);
 </script>

+ 35 - 0
src/views/JXSK/production/receive/index.vue

@@ -28,6 +28,20 @@
         :rules="rules"
         ref="byform"
       >
+        <template #file>
+          <div style="width: 100%">
+            <el-upload
+              v-model:fileList="formData.data.fileList"
+              action="https://winfaster.obs.cn-south-1.myhuaweicloud.com"
+              :data="uploadData"
+              multiple
+              :before-upload="uploadFile"
+              :on-preview="onPreviewFile"
+            >
+              <el-button>选择</el-button>
+            </el-upload>
+          </div>
+        </template>
       </byForm>
       <template #footer>
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
@@ -195,6 +209,11 @@ const formConfig = computed(() => {
       },
     },
     {
+      type: "slot",
+      slotName: "file",
+      label: "工序图纸",
+    },
+    {
       type: "input",
       itemType: "text",
       prop: "previousProcessesName",
@@ -315,6 +334,22 @@ const getDtl = (row) => {
   }
   formOption.disabled = true;
   formData.data = { ...row };
+  proxy.post("/productionTaskDetail/detail", { id: row.id }).then((res) => {
+    if (res && res.productionTaskDetailRecordList.length > 0) {
+      let id = res.productionTaskDetailRecordList[0].id;
+      proxy.post("/fileInfo/getList", { businessIdList: [id] }).then((res) => {
+        if (res && res[id].length > 0) {
+          formData.data.fileList = res[id].map((item) => {
+            return {
+              raw: item,
+              name: item.fileName,
+              url: item.fileUrl,
+            };
+          });
+        }
+      });
+    }
+  });
   dialogVisible.value = true;
 };
 

+ 2 - 2
src/views/login.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="login">
-    <h1>ByteSailing</h1>
+    <h1>嘉兴双拓</h1>
     <div class="content">
       <div class="warp-bg">
         <div class="left-bg">
@@ -37,7 +37,7 @@
           >
             <div class="form" style="margin-top: 300px">
               <div class="">{{$t('login.welcomeToLogin')}}~</div>
-              <h2>ByteSailing {{$t('login.managementSystem')}}</h2>
+              <h2>嘉兴双拓 {{$t('login.managementSystem')}}</h2>
               <el-form-item prop="tenantId" style="margin-top: 30px">
                 <el-input
                   :placeholder="$t('login.pleaseEnterTheTenantId')"

+ 1 - 1
src/views/register.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="register">
     <el-form ref="registerRef" :model="registerForm" :rules="registerRules" class="register-form">
-      <h3 class="title">ByteSailing</h3>
+      <h3 class="title">嘉兴双拓</h3>
       <el-form-item prop="username">
         <el-input 
           v-model="registerForm.username"