Selaa lähdekoodia

全局文件上传地址替换

cz 1 vuosi sitten
vanhempi
commit
3698101044
58 muutettua tiedostoa jossa 455 lisäystä ja 209 poistoa
  1. 6 0
      .env.development
  2. 5 0
      .env.staging
  3. 7 8
      src/components/byForm/index.vue
  4. 1 1
      src/components/byTable/ElementsMapping.vue
  5. 4 5
      src/components/contractCom/productContract.vue
  6. 4 5
      src/components/contractCom/selectContract.vue
  7. 4 5
      src/components/contractCom/selectSample.vue
  8. 2 2
      src/components/detailCom/document/index.vue
  9. 6 6
      src/components/detailCom/exportTracking/index.vue
  10. 2 2
      src/components/process/EHSD/Contract.vue
  11. 4 5
      src/components/process/EHSD/ContractChange.vue
  12. 2 2
      src/components/process/EHSD/Purchase.vue
  13. 2 2
      src/components/process/EHSD/PurchaseChange.vue
  14. 4 5
      src/components/process/EHSD/Sample.vue
  15. 4 5
      src/components/process/EHSD/SampleChange.vue
  16. 6 6
      src/components/process/SF/Contract.vue
  17. 11 4
      src/components/process/SF/Purchase.vue
  18. 2 2
      src/components/process/SendFunds.vue
  19. 2 3
      src/components/product/SelectCompanyProduct.vue
  20. 2 3
      src/components/product/SelectCustomerProduct.vue
  21. 2 3
      src/components/product/SelectProduct.vue
  22. 10 0
      src/main.js
  23. 8 8
      src/views/EHSD/procurement/InspectionGoodsEHSD/index.vue
  24. 30 0
      src/views/EHSD/procurement/purchasedEHSD/index.vue
  25. 2 3
      src/views/EHSD/productLibrary/customerProduct/index.vue
  26. 6 7
      src/views/EHSD/saleContract/contractEHSD/index.vue
  27. 6 6
      src/views/EHSD/saleContract/exportTracking/index.vue
  28. 6 7
      src/views/EHSD/saleContract/sampleEHSD/index.vue
  29. 32 32
      src/views/JST/order/index.vue
  30. 35 2
      src/views/MES/productionOrder/index.vue
  31. 35 1
      src/views/MES/productionScheduling/index.vue
  32. 34 0
      src/views/MES/productionTask/index.vue
  33. 2 2
      src/views/connect/E-mail/mail/com/mailWrite.vue
  34. 2 2
      src/views/customer/file/index.vue
  35. 2 2
      src/views/customer/highseas/index.vue
  36. 2 2
      src/views/customer/privatesea/index.vue
  37. 2 2
      src/views/finance/fundManage/accountPayment/index.vue
  38. 2 2
      src/views/oa/companyDisk/webDiskData/index.vue
  39. 3 4
      src/views/oa/work/dailyPaper/index.vue
  40. 2 2
      src/views/oa/work/task/index.vue
  41. 3 3
      src/views/process/processApproval/index.vue
  42. 2 3
      src/views/product/product/index.vue
  43. 2 3
      src/views/product/product/index2.vue
  44. 2 3
      src/views/production/project/bom/index.vue
  45. 2 3
      src/views/production/project/processes/index.vue
  46. 8 8
      src/views/publicModule/companyConfig/index.vue
  47. 1 2
      src/views/purchaseManage/purchaseManage/handoverSlip/index.vue
  48. 1 2
      src/views/purchaseManage/purchaseManage/handoverSlipOne/index.vue
  49. 38 5
      src/views/purchaseManage/purchaseManage/purchase/index.vue
  50. 2 2
      src/views/purchaseManage/purchaseManage/purchaseDocumentary/index.vue
  51. 35 3
      src/views/purchaseManage/purchaseManage/subscribe/index.vue
  52. 2 2
      src/views/purchaseManage/purchasePayment/invoice/index.vue
  53. 44 1
      src/views/purchaseManage/supplier/supplier/index.vue
  54. 2 3
      src/views/salesMange/saleContract/claim/index.vue
  55. 2 2
      src/views/salesMange/saleContract/salesDocumentary/index.vue
  56. 2 2
      src/views/salesMange/saleContract/serviceContract/index.vue
  57. 2 2
      src/views/salesMange/shipmentMange/document/index.vue
  58. 2 2
      src/views/systemTenant/tenant/logoConfiguration/index.vue

+ 6 - 0
.env.development

@@ -9,4 +9,10 @@ VITE_APP_BASE_API = '/dev-api'
 
 VITE_APP_IP = '121.37.194.75'
 
+
+#上传文件地址
+VITE_APP_UPLOAD_API='121.37.194.75:20010'
+VITE_APP_UPLOAD_BASE_API = '/test-api'
+
+
 VITE_APP_WS_API = ':20010/test-api'

+ 5 - 0
.env.staging

@@ -14,5 +14,10 @@ VITE_APP_IP = '121.37.194.75'
 
 VITE_APP_WS_API = ':20010/test-api'
 
+#上传文件地址
+VITE_APP_UPLOAD_API='121.37.194.75:20010'
+VITE_APP_UPLOAD_BASE_API = '/test-api'
+
+
 # 是否强刷新
 VITE_REFRESH = true

+ 7 - 8
src/components/byForm/index.vue

@@ -106,10 +106,10 @@
           </slot>
 
           <div class="upload" v-else-if="i.type == 'upload'">
-            <el-upload :file-list="formData[i.prop]" action="https://winfaster.obs.cn-south-1.myhuaweicloud.com" :data="uploadData"
-                       :list-type="i.listType ? i.listType : 'text'" :accept="i.accept?i.accept :''" :limit="i.limit?i.limit:3"
-                       :before-upload="(file)=>handleBeforeUpload(file,i)" :on-success="()=>handleSuccess(i)"
-                       :on-remove="(file)=>handleRemove(file,i)" :on-exceed="()=>handleExceed(i)" :on-preview="onPreviewFile">
+            <el-upload :file-list="formData[i.prop]" :action="uploadUrl" :data="uploadData" :list-type="i.listType ? i.listType : 'text'"
+                       :accept="i.accept?i.accept :''" :limit="i.limit?i.limit:3" :before-upload="(file)=>handleBeforeUpload(file,i)"
+                       :on-success="()=>handleSuccess(i)" :on-remove="(file)=>handleRemove(file,i)" :on-exceed="()=>handleExceed(i)"
+                       :on-preview="onPreviewFile">
 
               <el-icon v-if="i.listType=='picture-card'">
                 <Plus />
@@ -119,9 +119,8 @@
           </div>
 
           <div class="upload" v-else-if="i.type == 'uploadImg'">
-            <el-upload action="https://winfaster.obs.cn-south-1.myhuaweicloud.com" accept=".gif, .jpeg, .jpg, .png" :show-file-list="false"
-                       :data="uploadData" :before-upload="(file)=>handleBeforeUploadOne(file,i.prop,i.imgProp)"
-                       :on-success="()=>handleSuccessOne(i.imgProp)">
+            <el-upload :action="uploadUrl" accept=".gif, .jpeg, .jpg, .png" :show-file-list="false" :data="uploadData"
+                       :before-upload="(file)=>handleBeforeUploadOne(file,i.prop,i.imgProp)" :on-success="()=>handleSuccessOne(i.imgProp)">
               <div v-loading="imgLoading">
                 <img v-if="formData[i.imgProp]" :src="formData[i.imgProp]" class="picOne" />
                 <el-icon v-else class="avatar-uploader-icon">
@@ -311,7 +310,7 @@ const dateFormatInit = (itemType) => {
   const formatObj = {
     year: "YYYY",
     month: "YYYY-MM",
-    date: "YYYY-MM-DD HH:mm:ss",
+    date: "YYYY-MM-DD",
     dates: "YYYY-MM-DD",
     datetime: "YYYY-MM-DD HH:mm:ss",
     monthrange: "YYYY-MM-DD HH:mm:ss",

+ 1 - 1
src/components/byTable/ElementsMapping.vue

@@ -79,7 +79,7 @@ export default defineComponent({
       };
     };
     if (getCellList.value.length > 3) {
-      console.log(getCellList);
+      console.log(getCellList, "asdasda");
       return {
         getCellList,
       };

+ 4 - 5
src/components/contractCom/productContract.vue

@@ -58,17 +58,16 @@
       <byForm :formConfig="formConfig" :formOption="formOption" v-model="handoverSlipForm">
         <template #file>
           <div style="width: 100%">
-            <el-upload v-model:fileList="handoverSlipForm.fileList" action="https://winfaster.obs.cn-south-1.myhuaweicloud.com" :data="uploadData"
-                       multiple :before-upload="uploadFile" :on-success="handleSuccess" :on-preview="onPreviewFile">
+            <el-upload v-model:fileList="handoverSlipForm.fileList" :action="uploadUrl" :data="uploadData" multiple :before-upload="uploadFile"
+                       :on-success="handleSuccess" :on-preview="onPreviewFile">
               <el-button type="primary" plain>选择</el-button>
             </el-upload>
           </div>
         </template>
         <template #indication>
           <div style="width: 100%">
-            <el-upload v-model:fileList="handoverSlipForm.packageFileList" action="https://winfaster.obs.cn-south-1.myhuaweicloud.com"
-                       :data="indicationUploadData" multiple :before-upload="indicationUploadFile" :on-success="handleSuccess"
-                       :on-preview="onPreviewFile">
+            <el-upload v-model:fileList="handoverSlipForm.packageFileList" :action="uploadUrl" :data="indicationUploadData" multiple
+                       :before-upload="indicationUploadFile" :on-success="handleSuccess" :on-preview="onPreviewFile">
               <el-button type="primary" plain>选择</el-button>
             </el-upload>
           </div>

+ 4 - 5
src/components/contractCom/selectContract.vue

@@ -58,17 +58,16 @@
       <byForm :formConfig="formConfig" :formOption="formOption" v-model="handoverSlipForm">
         <template #file>
           <div style="width: 100%">
-            <el-upload v-model:fileList="handoverSlipForm.fileList" action="https://winfaster.obs.cn-south-1.myhuaweicloud.com" :data="uploadData"
-                       multiple :before-upload="uploadFile" :on-success="handleSuccess" :on-preview="onPreviewFile">
+            <el-upload v-model:fileList="handoverSlipForm.fileList" :action="uploadUrl" :data="uploadData" multiple :before-upload="uploadFile"
+                       :on-success="handleSuccess" :on-preview="onPreviewFile">
               <el-button type="primary" plain>选择</el-button>
             </el-upload>
           </div>
         </template>
         <template #indication>
           <div style="width: 100%">
-            <el-upload v-model:fileList="handoverSlipForm.packageFileList" action="https://winfaster.obs.cn-south-1.myhuaweicloud.com"
-                       :data="indicationUploadData" multiple :before-upload="indicationUploadFile" :on-success="handleSuccess"
-                       :on-preview="onPreviewFile">
+            <el-upload v-model:fileList="handoverSlipForm.packageFileList" :action="uploadUrl" :data="indicationUploadData" multiple
+                       :before-upload="indicationUploadFile" :on-success="handleSuccess" :on-preview="onPreviewFile">
               <el-button type="primary" plain>选择</el-button>
             </el-upload>
           </div>

+ 4 - 5
src/components/contractCom/selectSample.vue

@@ -55,17 +55,16 @@
       <byForm :formConfig="formConfig" :formOption="formOption" v-model="handoverSlipForm">
         <template #file>
           <div style="width: 100%">
-            <el-upload v-model:fileList="handoverSlipForm.fileList" action="https://winfaster.obs.cn-south-1.myhuaweicloud.com" :data="uploadData"
-                       multiple :before-upload="uploadFile" :on-success="handleSuccess" :on-preview="onPreviewFile">
+            <el-upload v-model:fileList="handoverSlipForm.fileList" :action="uploadUrl" :data="uploadData" multiple :before-upload="uploadFile"
+                       :on-success="handleSuccess" :on-preview="onPreviewFile">
               <el-button type="primary" plain>选择</el-button>
             </el-upload>
           </div>
         </template>
         <template #indication>
           <div style="width: 100%">
-            <el-upload v-model:fileList="handoverSlipForm.packageFileList" action="https://winfaster.obs.cn-south-1.myhuaweicloud.com"
-                       :data="indicationUploadData" multiple :before-upload="indicationUploadFile" :on-success="handleSuccess"
-                       :on-preview="onPreviewFile">
+            <el-upload v-model:fileList="handoverSlipForm.packageFileList" :action="uploadUrl" :data="indicationUploadData" multiple
+                       :before-upload="indicationUploadFile" :on-success="handleSuccess" :on-preview="onPreviewFile">
               <el-button type="primary" plain>选择</el-button>
             </el-upload>
           </div>

+ 2 - 2
src/components/detailCom/document/index.vue

@@ -92,8 +92,8 @@
         </template>
         <template #file>
           <div style="width: 100%">
-            <el-upload v-model:fileList="fileList" action="https://winfaster.obs.cn-south-1.myhuaweicloud.com" :data="uploadData" multiple
-                       :before-upload="uploadFile" :on-preview="onPreviewFile">
+            <el-upload v-model:fileList="fileList" :action="uploadUrl" :data="uploadData" multiple :before-upload="uploadFile"
+                       :on-preview="onPreviewFile">
               <el-button>选择</el-button>
             </el-upload>
           </div>

+ 6 - 6
src/components/detailCom/exportTracking/index.vue

@@ -209,8 +209,8 @@
               v-loading="formLoading">
         <template #file>
           <div style="width: 100%">
-            <el-upload v-model:fileList="formData.remarksFormData.fileList" action="https://winfaster.obs.cn-south-1.myhuaweicloud.com"
-                       :data="uploadData" multiple :before-upload="uploadFile" :on-success="handleSuccess" :on-preview="onPreviewFile">
+            <el-upload v-model:fileList="formData.remarksFormData.fileList" :action="uploadUrl" :data="uploadData" multiple
+                       :before-upload="uploadFile" :on-success="handleSuccess" :on-preview="onPreviewFile">
               <el-button type="primary" plain>选择</el-button>
             </el-upload>
           </div>
@@ -261,8 +261,8 @@
       <byForm :formConfig="filesFormConfig" :formOption="formOption" v-model="formData.filesFormData">
         <template #file>
           <div style="width: 100%">
-            <el-upload v-model:fileList="formData.filesFormData.fileList" action="https://winfaster.obs.cn-south-1.myhuaweicloud.com"
-                       :data="uploadData" multiple :before-upload="uploadFile" :on-success="handleSuccess" :on-preview="onPreviewFile">
+            <el-upload v-model:fileList="formData.filesFormData.fileList" :action="uploadUrl" :data="uploadData" multiple :before-upload="uploadFile"
+                       :on-success="handleSuccess" :on-preview="onPreviewFile">
               <el-button type="primary" plain disabled>选择</el-button>
             </el-upload>
           </div>
@@ -327,8 +327,8 @@
         </template>
         <template #file>
           <div style="width: 100%">
-            <el-upload v-model:fileList="formData.recordsFormData.fileList" action="https://winfaster.obs.cn-south-1.myhuaweicloud.com"
-                       :data="uploadData" multiple :before-upload="uploadFile" :on-success="handleSuccess" :on-preview="onPreviewFile">
+            <el-upload v-model:fileList="formData.recordsFormData.fileList" :action="uploadUrl" :data="uploadData" multiple
+                       :before-upload="uploadFile" :on-success="handleSuccess" :on-preview="onPreviewFile">
               <el-button type="primary" plain>选择</el-button>
             </el-upload>
           </div>

+ 2 - 2
src/components/process/EHSD/Contract.vue

@@ -147,8 +147,8 @@
             <el-table-column label="设计图稿" width="80">
               <template #default="{ row, $index }">
                 <div style="width: 100%">
-                  <el-upload action="https://winfaster.obs.cn-south-1.myhuaweicloud.com" accept=".gif, .jpeg, .jpg, .png" :show-file-list="false"
-                             :data="uploadData" :before-upload="(file)=>handleBeforeUpload(file,$index)" :on-success="()=>handleSuccess($index)">
+                  <el-upload :action="uploadUrl" accept=".gif, .jpeg, .jpg, .png" :show-file-list="false" :data="uploadData"
+                             :before-upload="(file)=>handleBeforeUpload(file,$index)" :on-success="()=>handleSuccess($index)">
                     <img v-if="row.imageUrl" :src="row.imageUrl" class="pic" />
                     <el-icon v-else class="avatar-uploader-icon">
                       <Plus />

+ 4 - 5
src/components/process/EHSD/ContractChange.vue

@@ -389,17 +389,16 @@
       </template>
       <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-success="handleSuccess" :on-preview="onPreviewFile">
+          <el-upload v-model:fileList="formData.data.fileList" :action="uploadUrl" :data="uploadData" multiple :before-upload="uploadFile"
+                     :on-success="handleSuccess" :on-preview="onPreviewFile">
             <el-button type="primary" plain>选择</el-button>
           </el-upload>
         </div>
       </template>
       <template #indication>
         <div style="width: 100%">
-          <el-upload v-model:fileList="formData.data.packageFileList" action="https://winfaster.obs.cn-south-1.myhuaweicloud.com"
-                     :data="indicationUploadData" multiple :before-upload="indicationUploadFile" :on-success="handleSuccess"
-                     :on-preview="onPreviewFile">
+          <el-upload v-model:fileList="formData.data.packageFileList" :action="uploadUrl" :data="indicationUploadData" multiple
+                     :before-upload="indicationUploadFile" :on-success="handleSuccess" :on-preview="onPreviewFile">
             <el-button type="primary" plain>选择</el-button>
           </el-upload>
         </div>

+ 2 - 2
src/components/process/EHSD/Purchase.vue

@@ -489,8 +489,8 @@
       <byForm :formConfig="formHandoverConfig" :formOption="formOption" v-model="productRow.data">
         <template #file>
           <div style="width: 100%">
-            <el-upload v-model:fileList="fileList" action="https://winfaster.obs.cn-south-1.myhuaweicloud.com" :data="uploadData" multiple
-                       :before-upload="uploadFile" :on-success="handleSuccess" :on-preview="onPreviewFile">
+            <el-upload v-model:fileList="fileList" :action="uploadUrl" :data="uploadData" multiple :before-upload="uploadFile"
+                       :on-success="handleSuccess" :on-preview="onPreviewFile">
               <el-button>选择</el-button>
             </el-upload>
           </div>

+ 2 - 2
src/components/process/EHSD/PurchaseChange.vue

@@ -473,8 +473,8 @@
       <byForm :formConfig="formHandoverConfig" :formOption="formOption" v-model="productRow.data">
         <template #file>
           <div style="width: 100%">
-            <el-upload v-model:fileList="fileList" action="https://winfaster.obs.cn-south-1.myhuaweicloud.com" :data="uploadData" multiple
-                       :before-upload="uploadFile" :on-success="handleSuccess" :on-preview="onPreviewFile">
+            <el-upload v-model:fileList="fileList" :action="uploadUrl" :data="uploadData" multiple :before-upload="uploadFile"
+                       :on-success="handleSuccess" :on-preview="onPreviewFile">
               <el-button>选择</el-button>
             </el-upload>
           </div>

+ 4 - 5
src/components/process/EHSD/Sample.vue

@@ -345,17 +345,16 @@
       </template>
       <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-success="handleSuccess" :on-preview="onPreviewFile">
+          <el-upload v-model:fileList="formData.data.fileList" :action="uploadUrl" :data="uploadData" multiple :before-upload="uploadFile"
+                     :on-success="handleSuccess" :on-preview="onPreviewFile">
             <el-button type="primary" plain>选择</el-button>
           </el-upload>
         </div>
       </template>
       <template #indication>
         <div style="width: 100%">
-          <el-upload v-model:fileList="formData.data.packageFileList" action="https://winfaster.obs.cn-south-1.myhuaweicloud.com"
-                     :data="indicationUploadData" multiple :before-upload="indicationUploadFile" :on-success="handleSuccess"
-                     :on-preview="onPreviewFile">
+          <el-upload v-model:fileList="formData.data.packageFileList" :action="uploadUrl" :data="indicationUploadData" multiple
+                     :before-upload="indicationUploadFile" :on-success="handleSuccess" :on-preview="onPreviewFile">
             <el-button type="primary" plain>选择</el-button>
           </el-upload>
         </div>

+ 4 - 5
src/components/process/EHSD/SampleChange.vue

@@ -338,17 +338,16 @@
       </template>
       <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-success="handleSuccess" :on-preview="onPreviewFile">
+          <el-upload v-model:fileList="formData.data.fileList" :action="uploadUrl" :data="uploadData" multiple :before-upload="uploadFile"
+                     :on-success="handleSuccess" :on-preview="onPreviewFile">
             <el-button type="primary" plain>选择</el-button>
           </el-upload>
         </div>
       </template>
       <template #indication>
         <div style="width: 100%">
-          <el-upload v-model:fileList="formData.data.packageFileList" action="https://winfaster.obs.cn-south-1.myhuaweicloud.com"
-                     :data="indicationUploadData" multiple :before-upload="indicationUploadFile" :on-success="handleSuccess"
-                     :on-preview="onPreviewFile">
+          <el-upload v-model:fileList="formData.data.packageFileList" :action="uploadUrl" :data="indicationUploadData" multiple
+                     :before-upload="indicationUploadFile" :on-success="handleSuccess" :on-preview="onPreviewFile">
             <el-button type="primary" plain>选择</el-button>
           </el-upload>
         </div>

+ 6 - 6
src/components/process/SF/Contract.vue

@@ -223,8 +223,8 @@
             <el-table-column label="设计图稿" width="80">
               <template #default="{ row, $index }">
                 <div style="width: 100%">
-                  <el-upload action="https://winfaster.obs.cn-south-1.myhuaweicloud.com" accept=".gif, .jpeg, .jpg, .png" :show-file-list="false"
-                             :data="uploadData" :before-upload="(file)=>handleBeforeUpload(file,$index)" :on-success="()=>handleSuccess($index)">
+                  <el-upload :action="uploadUrl" accept=".gif, .jpeg, .jpg, .png" :show-file-list="false" :data="uploadData"
+                             :before-upload="(file)=>handleBeforeUpload(file,$index)" :on-success="()=>handleSuccess($index)">
                     <div v-loading="row.imgLoading">
                       <img v-if="row.imageUrl" :src="row.imageUrl" class="pic" />
                       <el-icon v-else class="avatar-uploader-icon">
@@ -248,10 +248,10 @@
                         <span class="el-click" @click="onPicture(row.fileListOne[0].fileUrl)">{{row.fileListOne[0].fileName}}</span>
                       </div>
                       <div v-else>
-                        <el-upload :file-list="row.prodFileList" action="https://winfaster.obs.cn-south-1.myhuaweicloud.com" :data="uploadData"
-                                   :limit="1" :list-type="'text'" :before-upload="(file)=>handleBeforeUploadOne(file,$index)"
-                                   :on-success="()=>handleSuccessOne($index)" :on-remove="(file)=>handleRemoveFile(file,$index)"
-                                   :on-preview="onPreviewFile" :on-exceed="()=>msgTip(`上传文件数量不可大于1`, 2)">
+                        <el-upload :file-list="row.prodFileList" :action="uploadUrl" :data="uploadData" :limit="1" :list-type="'text'"
+                                   :before-upload="(file)=>handleBeforeUploadOne(file,$index)" :on-success="()=>handleSuccessOne($index)"
+                                   :on-remove="(file)=>handleRemoveFile(file,$index)" :on-preview="onPreviewFile"
+                                   :on-exceed="()=>msgTip(`上传文件数量不可大于1`, 2)">
                           <el-button text type="primary">上传</el-button>
                         </el-upload>
                       </div>

+ 11 - 4
src/components/process/SF/Purchase.vue

@@ -915,12 +915,19 @@ const remoteMethod = (keyword) => {
 const handleSubmit = async () => {
   let flag = await formDom.value.handleSubmit(() => {});
   if (flag) {
+    for (let i = 0; i < formData.data.purchaseProductList.length; i++) {
+      const e = formData.data.purchaseProductList[i];
+      if (e.quantity + e.purchaseCount > e.subscribeCount) {
+        proxy.msgTip("采购数量加已采购数量不可大于采购量", 2);
+        return false;
+      }
+    }
     return true;
   } else {
-    setTimeout(() => {
-      const errorDiv = document.getElementsByClassName("is-error");
-      errorDiv[0].scrollIntoView();
-    }, 0);
+    // setTimeout(() => {
+    //   const errorDiv = document.getElementsByClassName("is-error");
+    //   errorDiv[0].scrollIntoView();
+    // }, 0);
   }
   return flag;
 };

+ 2 - 2
src/components/process/SendFunds.vue

@@ -81,8 +81,8 @@
           </el-form-item>
           <el-form-item label="上传附件">
             <div style="width: 100%">
-              <el-upload v-model:fileList="fileList" action="https://winfaster.obs.cn-south-1.myhuaweicloud.com" :data="uploadData" multiple
-                         :before-upload="handleBeforeUpload" :on-success="handleSuccess" :on-preview="onPreviewFile">
+              <el-upload v-model:fileList="fileList" :action="uploadUrl" :data="uploadData" multiple :before-upload="handleBeforeUpload"
+                         :on-success="handleSuccess" :on-preview="onPreviewFile">
                 <el-button>选择</el-button>
               </el-upload>
             </div>

+ 2 - 3
src/components/product/SelectCompanyProduct.vue

@@ -60,9 +60,8 @@
           </template>
           <template #productPic>
             <div>
-              <el-upload v-model:fileList="fileList" action="https://winfaster.obs.cn-south-1.myhuaweicloud.com" :data="uploadData"
-                         list-type="picture-card" :on-remove="handleRemove" :before-upload="handleBeforeUpload" :on-preview="handlePreview"
-                         accept=".gif, .jpeg, .jpg, .png">
+              <el-upload v-model:fileList="fileList" :action="uploadUrl" :data="uploadData" list-type="picture-card" :on-remove="handleRemove"
+                         :before-upload="handleBeforeUpload" :on-preview="handlePreview" accept=".gif, .jpeg, .jpg, .png">
                 <el-icon>
                   <Plus />
                 </el-icon>

+ 2 - 3
src/components/product/SelectCustomerProduct.vue

@@ -72,9 +72,8 @@
           </template>
           <template #productPic>
             <div>
-              <el-upload v-model:fileList="fileList" action="https://winfaster.obs.cn-south-1.myhuaweicloud.com" :data="uploadData"
-                         list-type="picture-card" :on-remove="handleRemove" :before-upload="handleBeforeUpload" :on-preview="handlePreview"
-                         accept=".gif, .jpeg, .jpg, .png">
+              <el-upload v-model:fileList="fileList" :action="uploadUrl" :data="uploadData" list-type="picture-card" :on-remove="handleRemove"
+                         :before-upload="handleBeforeUpload" :on-preview="handlePreview" accept=".gif, .jpeg, .jpg, .png">
                 <el-icon>
                   <Plus />
                 </el-icon>

+ 2 - 3
src/components/product/SelectProduct.vue

@@ -60,9 +60,8 @@
           </template>
           <template #productPic>
             <div>
-              <el-upload v-model:fileList="fileList" action="https://winfaster.obs.cn-south-1.myhuaweicloud.com" :data="uploadData"
-                         list-type="picture-card" :on-remove="handleRemove" :before-upload="handleBeforeUpload" :on-preview="handlePreview"
-                         accept=".gif, .jpeg, .jpg, .png">
+              <el-upload v-model:fileList="fileList" :action="uploadUrl" :data="uploadData" list-type="picture-card" :on-remove="handleRemove"
+                         :before-upload="handleBeforeUpload" :on-preview="handlePreview" accept=".gif, .jpeg, .jpg, .png">
                 <el-icon>
                   <Plus />
                 </el-icon>

+ 10 - 0
src/main.js

@@ -28,6 +28,14 @@ import TitleInfo from "@/components/TitleInfo/index.vue";
 import './permission' // permission control
 // userStore
 import useUserStore from "@/store/modules/user";
+// 全局文件上传地址
+let prefix =
+  window.location.protocol.indexOf("https") >= 0 ? "https://" : "http://";
+const uploadUrl =
+  prefix +
+  import.meta.env.VITE_APP_UPLOAD_API +
+  import.meta.env.VITE_APP_UPLOAD_BASE_API + '/open/fileInfo/upload'
+
 import {
   useDict
 } from '@/utils/dict'
@@ -83,6 +91,8 @@ import print from "vue3-print-nb"
 const app = createApp(App)
 console.log(i18n.global.t('login.welcomeToLogin'))
 // 全局方法挂载
+
+app.config.globalProperties.uploadUrl = uploadUrl
 app.config.globalProperties.useDict = useDict
 app.config.globalProperties.get = get
 app.config.globalProperties.post = post

+ 8 - 8
src/views/EHSD/procurement/InspectionGoodsEHSD/index.vue

@@ -202,8 +202,8 @@
                   </el-table>
                 </div>
                 <el-form-item label="Sample Collection Record" style="margin-top: 20px">
-                  <el-upload v-model:fileList="fileListOne" action="https://winfaster.obs.cn-south-1.myhuaweicloud.com" :data="uploadDataOne" multiple
-                             list-type="picture-card" :before-upload="uploadFileOne" accept=".gif, .jpeg, .jpg, .png">
+                  <el-upload v-model:fileList="fileListOne" :action="uploadUrl" :data="uploadDataOne" multiple list-type="picture-card"
+                             :before-upload="uploadFileOne" accept=".gif, .jpeg, .jpg, .png">
                     <el-icon>
                       <Plus />
                     </el-icon>
@@ -419,8 +419,8 @@
                   </el-table>
                 </div>
                 <el-form-item label="Defect photos of Items" style="margin-top: 20px">
-                  <el-upload v-model:fileList="fileListTwo" action="https://winfaster.obs.cn-south-1.myhuaweicloud.com" :data="uploadDataTwo" multiple
-                             list-type="picture-card" :before-upload="uploadFileTwo" accept=".gif, .jpeg, .jpg, .png">
+                  <el-upload v-model:fileList="fileListTwo" :action="uploadUrl" :data="uploadDataTwo" multiple list-type="picture-card"
+                             :before-upload="uploadFileTwo" accept=".gif, .jpeg, .jpg, .png">
                     <el-icon>
                       <Plus />
                     </el-icon>
@@ -525,8 +525,8 @@
                   </el-col>
                 </el-row>
                 <el-form-item label="Photos" style="margin-top: 20px">
-                  <el-upload v-model:fileList="fileListThree" action="https://winfaster.obs.cn-south-1.myhuaweicloud.com" :data="uploadDataThree"
-                             multiple list-type="picture-card" :before-upload="uploadFileThree" accept=".gif, .jpeg, .jpg, .png">
+                  <el-upload v-model:fileList="fileListThree" :action="uploadUrl" :data="uploadDataThree" multiple list-type="picture-card"
+                             :before-upload="uploadFileThree" accept=".gif, .jpeg, .jpg, .png">
                     <el-icon>
                       <Plus />
                     </el-icon>
@@ -803,8 +803,8 @@
               <div style="width: 100%">
                 <div style="margin-top: 20px">SUPPORT DOCUMENTATION</div>
                 <el-form-item label="Video" required>
-                  <el-upload class="avatar-uploader" action="https://winfaster.obs.cn-south-1.myhuaweicloud.com" :data="uploadDataFour"
-                             :show-file-list="false" :on-success="onSuccess" :before-upload="uploadFileFour" accept=".mp4">
+                  <el-upload class="avatar-uploader" :action="uploadUrl" :data="uploadDataFour" :show-file-list="false" :on-success="onSuccess"
+                             :before-upload="uploadFileFour" accept=".mp4">
                     <video v-if="formData.data.supportDocumentationFileList && formData.data.supportDocumentationFileList.length > 0"
                            :src="formData.data.supportDocumentationFileList[0].fileUrl" style="width: 300px; height: 300px" controls></video>
                     <el-icon v-else class="avatar-uploader-icon">

+ 30 - 0
src/views/EHSD/procurement/purchasedEHSD/index.vue

@@ -108,9 +108,15 @@ const sourceList = ref({
   },
 });
 const loading = ref(false);
+const companyData = ref([]);
 const selectConfig = computed(() => {
   return [
     {
+      label: "归属公司",
+      prop: "companyId",
+      data: companyData.value,
+    },
+    {
       label: "采购状态",
       prop: "status",
       data: status.value,
@@ -126,6 +132,13 @@ const config = computed(() => {
   return [
     {
       attrs: {
+        label: "归属公司",
+        prop: "companyName",
+        width: 130,
+      },
+    },
+    {
+      attrs: {
         label: "采购单号",
         slot: "code",
         width: 180,
@@ -315,6 +328,23 @@ const getDict = () => {
         };
       });
     });
+
+  proxy
+    .get("/tenantDept/list", {
+      pageNum: 1,
+      pageSize: 9999,
+      keyword: "",
+      tenantId: proxy.useUserStore().user.tenantId,
+      type: 0,
+    })
+    .then((res) => {
+      companyData.value = res.data.map((x) => ({
+        ...x,
+        label: x.deptName,
+        value: x.deptId,
+      }));
+      // treeData.value = proxy.handleTree(res.data, "deptId");
+    });
 };
 const getList = async (req) => {
   sourceList.value.pagination = { ...sourceList.value.pagination, ...req };

+ 2 - 3
src/views/EHSD/productLibrary/customerProduct/index.vue

@@ -79,9 +79,8 @@
           </template>
           <template #productPic>
             <div>
-              <el-upload v-model:fileList="fileList" action="https://winfaster.obs.cn-south-1.myhuaweicloud.com" :data="uploadData"
-                         list-type="picture-card" :on-remove="handleRemove" :before-upload="handleBeforeUpload" :on-preview="handlePreview"
-                         accept=".gif, .jpeg, .jpg, .png">
+              <el-upload v-model:fileList="fileList" :action="uploadUrl" :data="uploadData" list-type="picture-card" :on-remove="handleRemove"
+                         :before-upload="handleBeforeUpload" :on-preview="handlePreview" accept=".gif, .jpeg, .jpg, .png">
                 <el-icon>
                   <Plus />
                 </el-icon>

+ 6 - 7
src/views/EHSD/saleContract/contractEHSD/index.vue

@@ -122,17 +122,16 @@
       <byForm :formConfig="formConfig" :formOption="formOption" v-model="handoverSlipForm">
         <template #file>
           <div style="width: 100%">
-            <el-upload v-model:fileList="handoverSlipForm.fileList" action="https://winfaster.obs.cn-south-1.myhuaweicloud.com" :data="uploadData"
-                       multiple :before-upload="uploadFile" :on-success="handleSuccess" :on-preview="onPreviewFile">
+            <el-upload v-model:fileList="handoverSlipForm.fileList" :action="uploadUrl" :data="uploadData" multiple :before-upload="uploadFile"
+                       :on-success="handleSuccess" :on-preview="onPreviewFile">
               <el-button type="primary" plain>选择</el-button>
             </el-upload>
           </div>
         </template>
         <template #indication>
           <div style="width: 100%">
-            <el-upload v-model:fileList="handoverSlipForm.packageFileList" action="https://winfaster.obs.cn-south-1.myhuaweicloud.com"
-                       :data="indicationUploadData" multiple :before-upload="indicationUploadFile" :on-success="handleSuccess"
-                       :on-preview="onPreviewFile">
+            <el-upload v-model:fileList="handoverSlipForm.packageFileList" :action="uploadUrl" :data="indicationUploadData" multiple
+                       :before-upload="indicationUploadFile" :on-success="handleSuccess" :on-preview="onPreviewFile">
               <el-button type="primary" plain>选择</el-button>
             </el-upload>
           </div>
@@ -186,8 +185,8 @@
               v-loading="formLoading">
         <template #file>
           <div style="width: 100%">
-            <el-upload v-model:fileList="formData.recordsFormData.fileList" action="https://winfaster.obs.cn-south-1.myhuaweicloud.com"
-                       :data="uploadData" multiple :before-upload="uploadFile" :on-success="handleSuccess" :on-preview="onPreviewFile">
+            <el-upload v-model:fileList="formData.recordsFormData.fileList" :action="uploadUrl" :data="uploadData" multiple
+                       :before-upload="uploadFile" :on-success="handleSuccess" :on-preview="onPreviewFile">
               <el-button type="primary" plain>选择</el-button>
             </el-upload>
           </div>

+ 6 - 6
src/views/EHSD/saleContract/exportTracking/index.vue

@@ -209,8 +209,8 @@
               v-loading="formLoading">
         <template #file>
           <div style="width: 100%">
-            <el-upload v-model:fileList="formData.remarksFormData.fileList" action="https://winfaster.obs.cn-south-1.myhuaweicloud.com"
-                       :data="uploadData" multiple :before-upload="uploadFile" :on-success="handleSuccess" :on-preview="onPreviewFile">
+            <el-upload v-model:fileList="formData.remarksFormData.fileList" :action="uploadUrl" :data="uploadData" multiple
+                       :before-upload="uploadFile" :on-success="handleSuccess" :on-preview="onPreviewFile">
               <el-button type="primary" plain>选择</el-button>
             </el-upload>
           </div>
@@ -261,8 +261,8 @@
       <byForm :formConfig="filesFormConfig" :formOption="formOption" v-model="formData.filesFormData">
         <template #file>
           <div style="width: 100%">
-            <el-upload v-model:fileList="formData.filesFormData.fileList" action="https://winfaster.obs.cn-south-1.myhuaweicloud.com"
-                       :data="uploadData" multiple :before-upload="uploadFile" :on-success="handleSuccess" :on-preview="onPreviewFile">
+            <el-upload v-model:fileList="formData.filesFormData.fileList" :action="uploadUrl" :data="uploadData" multiple :before-upload="uploadFile"
+                       :on-success="handleSuccess" :on-preview="onPreviewFile">
               <el-button type="primary" plain disabled>选择</el-button>
             </el-upload>
           </div>
@@ -327,8 +327,8 @@
         </template>
         <template #file>
           <div style="width: 100%">
-            <el-upload v-model:fileList="formData.recordsFormData.fileList" action="https://winfaster.obs.cn-south-1.myhuaweicloud.com"
-                       :data="uploadData" multiple :before-upload="uploadFile" :on-success="handleSuccess" :on-preview="onPreviewFile">
+            <el-upload v-model:fileList="formData.recordsFormData.fileList" :action="uploadUrl" :data="uploadData" multiple
+                       :before-upload="uploadFile" :on-success="handleSuccess" :on-preview="onPreviewFile">
               <el-button type="primary" plain>选择</el-button>
             </el-upload>
           </div>

+ 6 - 7
src/views/EHSD/saleContract/sampleEHSD/index.vue

@@ -60,17 +60,16 @@
       <byForm :formConfig="formConfig" :formOption="formOption" v-model="handoverSlipForm">
         <template #file>
           <div style="width: 100%">
-            <el-upload v-model:fileList="handoverSlipForm.fileList" action="https://winfaster.obs.cn-south-1.myhuaweicloud.com" :data="uploadData"
-                       multiple :before-upload="uploadFile" :on-success="handleSuccess" :on-preview="onPreviewFile">
+            <el-upload v-model:fileList="handoverSlipForm.fileList" :action="uploadUrl" :data="uploadData" multiple :before-upload="uploadFile"
+                       :on-success="handleSuccess" :on-preview="onPreviewFile">
               <el-button type="primary" plain>选择</el-button>
             </el-upload>
           </div>
         </template>
         <template #indication>
           <div style="width: 100%">
-            <el-upload v-model:fileList="handoverSlipForm.packageFileList" action="https://winfaster.obs.cn-south-1.myhuaweicloud.com"
-                       :data="indicationUploadData" multiple :before-upload="indicationUploadFile" :on-success="handleSuccess"
-                       :on-preview="onPreviewFile">
+            <el-upload v-model:fileList="handoverSlipForm.packageFileList" :action="uploadUrl" :data="indicationUploadData" multiple
+                       :before-upload="indicationUploadFile" :on-success="handleSuccess" :on-preview="onPreviewFile">
               <el-button type="primary" plain>选择</el-button>
             </el-upload>
           </div>
@@ -135,8 +134,8 @@
               v-loading="formLoading">
         <template #file>
           <div style="width: 100%">
-            <el-upload v-model:fileList="formData.recordsFormData.fileList" action="https://winfaster.obs.cn-south-1.myhuaweicloud.com"
-                       :data="uploadData" multiple :before-upload="uploadFile" :on-success="handleSuccess" :on-preview="onPreviewFile">
+            <el-upload v-model:fileList="formData.recordsFormData.fileList" :action="uploadUrl" :data="uploadData" multiple
+                       :before-upload="uploadFile" :on-success="handleSuccess" :on-preview="onPreviewFile">
               <el-button type="primary" plain>选择</el-button>
             </el-upload>
           </div>

+ 32 - 32
src/views/JST/order/index.vue

@@ -18,11 +18,11 @@
       <byForm :formConfig="formConfig" :formOption="formOption" v-model="formData.data" :rules="rules" ref="formDom" v-loading="submitLoading">
         <template #details>
           <div style="width:100%">
-            <el-table :data="formData.data.data">
-              <el-table-column prop="deptName" label="商品编码" min-width="260" />
-              <el-table-column prop="type" label="商品名称" width="100" />
-              <el-table-column prop="type" label="单价" width="100" />
-              <el-table-column prop="type" label="数量" width="100" />
+            <el-table :data="formData.data.items">
+              <el-table-column prop="shopSkuId" label="商品编码" width="170" />
+              <el-table-column prop="name" label="商品名称" />
+              <el-table-column prop="price" label="单价" width="100" />
+              <el-table-column prop="qty" label="数量" width="100" />
             </el-table>
           </div>
         </template>
@@ -41,6 +41,9 @@
 import byTable from "@/components/byTable/index";
 import byForm from "@/components/byForm/index";
 const { proxy } = getCurrentInstance();
+const jstShopStatus = computed(
+  () => proxy.useUserStore().allDict["jst_status"]
+);
 const loading = ref(false);
 const submitLoading = ref(false);
 const sourceList = ref({
@@ -55,33 +58,19 @@ const sourceList = ref({
 const treeData = ref([]);
 const dialogVisible = ref(false);
 const modalType = ref("add");
-const statusData = ref([
-  {
-    label: "未开始",
-    value: "0",
-  },
-  {
-    label: "进行中",
-    value: "1",
-  },
-  {
-    label: "已完成",
-    value: "2",
-  },
-]);
 const selectConfig = computed(() => [
   {
     label: "订单状态",
-    prop: "produceStatus",
-    data: statusData.value,
+    prop: "status",
+    data: jstShopStatus.value,
   },
   {
     type: "time",
     label: "订单时间",
     placeholder: "开始日期",
-    prop: "staDeliveryPeriod",
+    prop: "startTime",
     placeholderOne: "结束日期",
-    propOne: "endDeliveryPeriod",
+    propOne: "endTime",
   },
 ]);
 const config = computed(() => {
@@ -91,60 +80,73 @@ const config = computed(() => {
         label: "内部订单号",
         prop: "oid",
         slot: "code",
+        width: 110,
       },
     },
     {
       attrs: {
         label: "分销商",
         prop: "drpFrom",
+        "min-width": 120,
       },
     },
     {
       attrs: {
         label: "订单日期",
         prop: "created",
+        width: 160,
       },
     },
     {
       attrs: {
         label: "订单状态",
-        prop: "shopStatus",
+        prop: "status",
+        width: 140,
+      },
+      render(val) {
+        return proxy.dictKeyValue(val, jstShopStatus.value);
       },
     },
     {
       attrs: {
         label: "订单来源",
         prop: "shopSite",
+        width: 110,
       },
     },
     {
       attrs: {
         label: "店铺",
         prop: "shopName",
+        "min-width": 150,
       },
     },
     {
       attrs: {
         label: "商品",
         prop: "skus",
+        "min-width": 150,
       },
     },
     {
       attrs: {
         label: "应付金额",
         prop: "payAmount",
+        width: 100,
       },
     },
     {
       attrs: {
         label: "已付金额",
         prop: "paidAmount",
+        width: 100,
       },
     },
     {
       attrs: {
         label: "付款时间",
         prop: "payDate",
+        width: 160,
       },
     },
     // {
@@ -239,7 +241,7 @@ getDeptData();
 const getList = async (req) => {
   sourceList.value.pagination = { ...sourceList.value.pagination, ...req };
   loading.value = true;
-  proxy.post("/shopInfo/page", sourceList.value.pagination).then((res) => {
+  proxy.post("/jstOrderInfo/page", sourceList.value.pagination).then((res) => {
     sourceList.value.data = res.rows;
     sourceList.value.pagination.total = res.total;
     setTimeout(() => {
@@ -286,13 +288,11 @@ const getDtl = (row) => {
   });
 };
 
-const handleGetDtl = (item) => {
-  dialogVisible.value = true;
-  modalType.value = "add";
-  formData.data = {
-    definition: "2",
-    fileList: [],
-  };
+const handleGetDtl = (row) => {
+  proxy.post("/jstOrderInfo/detail", { id: row.id }).then((res) => {
+    formData.data = res;
+    dialogVisible.value = true;
+  });
 };
 
 getList();

+ 35 - 2
src/views/MES/productionOrder/index.vue

@@ -179,8 +179,8 @@
               <el-table-column label="设计图稿" width="80">
                 <template #default="{ row, $index }">
                   <div style="width: 100%">
-                    <el-upload action="https://winfaster.obs.cn-south-1.myhuaweicloud.com" accept=".gif, .jpeg, .jpg, .png" :show-file-list="false"
-                               :data="uploadData" :before-upload="(file)=>handleBeforeUpload(file,$index)" :on-success="()=>handleSuccess($index)">
+                    <el-upload :action="uploadUrl" accept=".gif, .jpeg, .jpg, .png" :show-file-list="false" :data="uploadData"
+                               :before-upload="(file)=>handleBeforeUpload(file,$index)" :on-success="()=>handleSuccess($index)">
                       <div v-loading="row.imgLoading">
                         <img v-if="row.imageUrl" :src="row.imageUrl" class="pic" />
                         <!-- <el-icon v-else class="avatar-uploader-icon">
@@ -231,6 +231,7 @@ const { proxy } = getCurrentInstance();
 const contractTag = computed(
   () => proxy.useUserStore().allDict["contract_prod_tag"]
 );
+const companyData = ref([]);
 const loading = ref(false);
 const submitLoading = ref(false);
 const sourceList = ref({
@@ -273,6 +274,11 @@ const statusData = ref([
 ]);
 const selectConfig = computed(() => [
   {
+    label: "生产公司",
+    prop: "companyId",
+    data: companyData.value,
+  },
+  {
     label: "生产状态",
     prop: "produceStatus",
     data: statusData.value,
@@ -298,6 +304,13 @@ const config = computed(() => {
   return [
     {
       attrs: {
+        label: "生产公司",
+        prop: "companyName",
+        width: 130,
+      },
+    },
+    {
+      attrs: {
         label: "订单号",
         slot: "code",
         width: 150,
@@ -601,6 +614,26 @@ const prodTagClose = (index, row) => {
     });
 };
 
+const getDict = () => {
+  proxy
+    .get("/tenantDept/list", {
+      pageNum: 1,
+      pageSize: 9999,
+      keyword: "",
+      tenantId: proxy.useUserStore().user.tenantId,
+      type: 0,
+    })
+    .then((res) => {
+      companyData.value = res.data.map((x) => ({
+        ...x,
+        label: x.deptName,
+        value: x.deptId,
+      }));
+      // treeData.value = proxy.handleTree(res.data, "deptId");
+    });
+};
+getDict();
+
 const clickToday = () => {
   today.value = moment().format("yyyy-MM-DD");
   month.value = moment().format("yyyy年MM月");

+ 35 - 1
src/views/MES/productionScheduling/index.vue

@@ -100,6 +100,7 @@ import moment from "moment";
 import { watch } from "vue";
 
 const { proxy } = getCurrentInstance();
+const companyData = ref([]);
 const loading = ref(false);
 const submitLoading = ref(false);
 let str = moment().format("yyyy-MM");
@@ -138,7 +139,7 @@ const allDay = ref([]);
 const changDay = (val) => {
   getList();
   allDay.value = [];
-  config.value.splice(3, config.value.length - 3);
+  config.value.splice(4, config.value.length - 4);
   let days = getDateAllDay(val);
   let list = [];
   for (let i = 0; i < days.length; i++) {
@@ -163,6 +164,11 @@ const changDay = (val) => {
 };
 const selectConfig = computed(() => [
   {
+    label: "生产公司",
+    prop: "companyId",
+    data: companyData.value,
+  },
+  {
     type: "time",
     itemType: "month",
     label: "排程日期",
@@ -180,6 +186,14 @@ const selectConfig = computed(() => [
 const config = ref([
   {
     attrs: {
+      label: "生产公司",
+      prop: "companyName",
+      width: 100,
+      align: "center",
+    },
+  },
+  {
+    attrs: {
       label: "生产订单号",
       prop: "code",
       width: 130,
@@ -309,6 +323,26 @@ const submitProduction = () => {
     });
   });
 };
+
+const getDict = () => {
+  proxy
+    .get("/tenantDept/list", {
+      pageNum: 1,
+      pageSize: 9999,
+      keyword: "",
+      tenantId: proxy.useUserStore().user.tenantId,
+      type: 0,
+    })
+    .then((res) => {
+      companyData.value = res.data.map((x) => ({
+        ...x,
+        label: x.deptName,
+        value: x.deptId,
+      }));
+      // treeData.value = proxy.handleTree(res.data, "deptId");
+    });
+};
+getDict();
 </script>
 
 <style lang="scss" scoped>

+ 34 - 0
src/views/MES/productionTask/index.vue

@@ -241,6 +241,7 @@ import QRCode from "qrcodejs2-fix";
 import moment from "moment";
 
 const { proxy } = getCurrentInstance();
+const companyData = ref([]);
 const loading = ref(false);
 const submitLoading = ref(false);
 const sourceList = ref({
@@ -276,6 +277,11 @@ const statusData = ref([
 ]);
 const selectConfig = computed(() => [
   {
+    label: "生产公司",
+    prop: "companyId",
+    data: companyData.value,
+  },
+  {
     label: "生产状态",
     prop: "produceStatus",
     data: statusData.value,
@@ -307,6 +313,14 @@ const config = ref([
   },
   {
     attrs: {
+      label: "生产公司",
+      prop: "companyName",
+      width: 100,
+      // align: "center",
+    },
+  },
+  {
+    attrs: {
       label: "订单号",
       prop: "orderCode",
       width: 130,
@@ -662,6 +676,26 @@ const showCotent = (slot, item) => {
     return false;
   }
 };
+
+const getDict = () => {
+  proxy
+    .get("/tenantDept/list", {
+      pageNum: 1,
+      pageSize: 9999,
+      keyword: "",
+      tenantId: proxy.useUserStore().user.tenantId,
+      type: 0,
+    })
+    .then((res) => {
+      companyData.value = res.data.map((x) => ({
+        ...x,
+        label: x.deptName,
+        value: x.deptId,
+      }));
+      // treeData.value = proxy.handleTree(res.data, "deptId");
+    });
+};
+getDict();
 </script>
 
 <style lang="scss" scoped>

+ 2 - 2
src/views/connect/E-mail/mail/com/mailWrite.vue

@@ -59,8 +59,8 @@
         </el-form-item>
         <el-form-item label="附件">
           <div style="width: 100%">
-            <el-upload v-model:fileList="fileList" class="upload-demo" action="https://winfaster.obs.cn-south-1.myhuaweicloud.com" :data="uploadData"
-                       drag multiple :show-file-list="false" :before-upload="handleBeforeUpload">
+            <el-upload v-model:fileList="fileList" class="upload-demo" :action="uploadUrl" :data="uploadData" drag multiple :show-file-list="false"
+                       :before-upload="handleBeforeUpload">
               <div>
                 <img src="@/assets/images/icon_attachment.svg" class="att-img" fit="scale-down" />
                 <span style="padding-left: 8px">将文件拖到此处,或<span style="color: #409eff">点击上传</span></span>

+ 2 - 2
src/views/customer/file/index.vue

@@ -230,8 +230,8 @@
       <byForm :formConfig="formConfigAFollow" :formOption="formOption" v-model="formFollow.data" :rules="rulesFollow" ref="follow">
         <template #fileSlot>
           <div style="width: 100%">
-            <el-upload v-model:fileList="fileList" action="https://winfaster.obs.cn-south-1.myhuaweicloud.com" :data="uploadData" multiple
-                       :before-upload="uploadFile" :on-preview="onPreviewFile">
+            <el-upload v-model:fileList="fileList" :action="uploadUrl" :data="uploadData" multiple :before-upload="uploadFile"
+                       :on-preview="onPreviewFile">
               <el-button type="primary">文件上传</el-button>
             </el-upload>
           </div>

+ 2 - 2
src/views/customer/highseas/index.vue

@@ -217,8 +217,8 @@
       <byForm :formConfig="formConfigAFollow" :formOption="formOption" v-model="formFollow.data" :rules="rulesFollow" ref="follow">
         <template #fileSlot>
           <div style="width: 100%">
-            <el-upload v-model:fileList="fileList" action="https://winfaster.obs.cn-south-1.myhuaweicloud.com" :data="uploadData" multiple
-                       :before-upload="uploadFile" :on-preview="onPreviewFile">
+            <el-upload v-model:fileList="fileList" :action="uploadUrl" :data="uploadData" multiple :before-upload="uploadFile"
+                       :on-preview="onPreviewFile">
               <el-button type="primary">文件上传</el-button>
             </el-upload>
           </div>

+ 2 - 2
src/views/customer/privatesea/index.vue

@@ -216,8 +216,8 @@
       <byForm :formConfig="formConfigAFollow" :formOption="formOption" v-model="formFollow.data" :rules="rulesFollow" ref="follow">
         <template #fileSlot>
           <div style="width: 100%">
-            <el-upload v-model:fileList="fileList" action="https://winfaster.obs.cn-south-1.myhuaweicloud.com" :data="uploadData" multiple
-                       :before-upload="uploadFile" :on-preview="onPreviewFile">
+            <el-upload v-model:fileList="fileList" :action="uploadUrl" :data="uploadData" multiple :before-upload="uploadFile"
+                       :on-preview="onPreviewFile">
               <el-button type="primary">文件上传</el-button>
             </el-upload>
           </div>

+ 2 - 2
src/views/finance/fundManage/accountPayment/index.vue

@@ -21,8 +21,8 @@
       <byForm :formConfig="formConfig" :formOption="formOption" v-model="formData.data" :rules="rules" ref="byform">
         <template #fileSlot>
           <div style="width: 100%">
-            <el-upload v-model:fileList="fileList" action="https://winfaster.obs.cn-south-1.myhuaweicloud.com" :data="uploadData" multiple
-                       :before-upload="uploadFile" :on-preview="onPreviewFile">
+            <el-upload v-model:fileList="fileList" :action="uploadUrl" :data="uploadData" multiple :before-upload="uploadFile"
+                       :on-preview="onPreviewFile">
               <el-button type="primary">文件上传</el-button>
             </el-upload>
           </div>

+ 2 - 2
src/views/oa/companyDisk/webDiskData/index.vue

@@ -32,8 +32,8 @@
       <byForm :formConfig="formConfig" :formOption="formOption" v-model="formData.data" :rules="rules" ref="submit">
         <template #productFile>
           <div style="width: 100%">
-            <el-upload v-model:fileList="fileList" action="https://winfaster.obs.cn-south-1.myhuaweicloud.com" :data="uploadData" multiple
-                       :before-upload="uploadFile" :on-preview="onPreviewFile">
+            <el-upload v-model:fileList="fileList" :action="uploadUrl" :data="uploadData" multiple :before-upload="uploadFile"
+                       :on-preview="onPreviewFile">
               <el-button>上传文件</el-button>
             </el-upload>
           </div>

+ 3 - 4
src/views/oa/work/dailyPaper/index.vue

@@ -52,8 +52,8 @@
             <template #productPic>
               <div>
                 <div>
-                  <el-upload v-model:fileList="imgList" action="https://winfaster.obs.cn-south-1.myhuaweicloud.com" :data="uploadData"
-                             list-type="picture-card" :before-upload="uploadPicture" :limit="5" accept=".gif, .jpeg, .jpg, .png">
+                  <el-upload v-model:fileList="imgList" :action="uploadUrl" :data="uploadData" list-type="picture-card" :before-upload="uploadPicture"
+                             :limit="5" accept=".gif, .jpeg, .jpg, .png">
                     <el-icon>
                       <Plus />
                     </el-icon>
@@ -64,8 +64,7 @@
             </template>
             <template #productFile>
               <div style="width: 100%">
-                <el-upload v-model:fileList="attachmentList" action="https://winfaster.obs.cn-south-1.myhuaweicloud.com" :data="uploadData"
-                           :before-upload="uploadFile" accept=".pdf">
+                <el-upload v-model:fileList="attachmentList" :action="uploadUrl" :data="uploadData" :before-upload="uploadFile" accept=".pdf">
                   <el-button>上传文件</el-button>
                   <span style="color: #909399; margin-left: 8px">上传格式为pdf文件</span>
                 </el-upload>

+ 2 - 2
src/views/oa/work/task/index.vue

@@ -44,8 +44,8 @@
         </template>
         <template #fileList>
           <div style="width: 100%">
-            <el-upload v-model:fileList="fileList" action="https://winfaster.obs.cn-south-1.myhuaweicloud.com" :data="uploadData" :limit="1"
-                       :before-upload="uploadFile" :on-preview="onPreviewFile">
+            <el-upload v-model:fileList="fileList" :action="uploadUrl" :data="uploadData" :limit="1" :before-upload="uploadFile"
+                       :on-preview="onPreviewFile">
               <el-button>选择</el-button>
             </el-upload>
           </div>

+ 3 - 3
src/views/process/processApproval/index.vue

@@ -82,7 +82,7 @@
           <el-form-item prop="remark" label-width="80px" label="附件上传">
             <el-upload
               v-model:fileList="flowForm.fileList"
-              action="https://winfaster.obs.cn-south-1.myhuaweicloud.com"
+              :action="uploadUrl"
               :data="uploadData"
               multiple
               :before-upload="uploadFile"
@@ -134,8 +134,8 @@
               </el-form-item>
               <el-form-item prop="remark" label="">
                 <div style="width:100%">
-                  <el-upload v-model:fileList="flowForm.fileList" drag action="https://winfaster.obs.cn-south-1.myhuaweicloud.com" :data="uploadData"
-                             multiple :before-upload="uploadFile" :on-success="handleSuccess" :on-preview="onPreviewFile">
+                  <el-upload v-model:fileList="flowForm.fileList" drag :action="uploadUrl" :data="uploadData" multiple :before-upload="uploadFile"
+                             :on-success="handleSuccess" :on-preview="onPreviewFile">
                     <el-icon class="el-icon--upload"><upload-filled /></el-icon>
                     <div class="el-upload__text">
                       点击或拖拽上传附件

+ 2 - 3
src/views/product/product/index.vue

@@ -51,9 +51,8 @@
         <byForm :formConfig="formConfig" :formOption="formOption" v-model="formData.data" :rules="rules" ref="byform">
           <template #productPic>
             <div>
-              <el-upload v-model:fileList="fileList" action="https://winfaster.obs.cn-south-1.myhuaweicloud.com" :data="uploadData"
-                         list-type="picture-card" :on-remove="handleRemove" :on-success="handleSuccess" :before-upload="handleBeforeUpload"
-                         accept=".gif, .jpeg, .jpg, .png">
+              <el-upload v-model:fileList="fileList" :action="uploadUrl" :data="uploadData" list-type="picture-card" :on-remove="handleRemove"
+                         :on-success="handleSuccess" :before-upload="handleBeforeUpload" accept=".gif, .jpeg, .jpg, .png">
                 <el-icon>
                   <Plus />
                 </el-icon>

+ 2 - 3
src/views/product/product/index2.vue

@@ -35,9 +35,8 @@
         <byForm :formConfig="formConfig" :formOption="formOption" v-model="formData.data" :rules="rules" ref="byform">
           <template #productPic>
             <div>
-              <el-upload v-model:fileList="fileList" action="https://winfaster.obs.cn-south-1.myhuaweicloud.com" :data="uploadData"
-                         list-type="picture-card" :on-remove="handleRemove" :on-success="handleSuccess" :before-upload="handleBeforeUpload"
-                         accept=".gif, .jpeg, .jpg, .png">
+              <el-upload v-model:fileList="fileList" :action="uploadUrl" :data="uploadData" list-type="picture-card" :on-remove="handleRemove"
+                         :on-success="handleSuccess" :before-upload="handleBeforeUpload" accept=".gif, .jpeg, .jpg, .png">
                 <el-icon>
                   <Plus />
                 </el-icon>

+ 2 - 3
src/views/production/project/bom/index.vue

@@ -20,9 +20,8 @@
       <byForm :formConfig="formConfig" :formOption="formOption" v-model="formData.data" :rules="rules" ref="byform">
         <template #slotFile>
           <div style="width: 100%">
-            <el-upload v-model:fileList="fileList" :show-file-list="false" class="upload-demo"
-                       action="https://winfaster.obs.cn-south-1.myhuaweicloud.com" :data="uploadData" :before-upload="handleBeforeUpload"
-                       accept=".rar,.zip">
+            <el-upload v-model:fileList="fileList" :show-file-list="false" class="upload-demo" :action="uploadUrl" :data="uploadData"
+                       :before-upload="handleBeforeUpload" accept=".rar,.zip">
               <el-button type="primary">选 择</el-button>
             </el-upload>
             <div>

+ 2 - 3
src/views/production/project/processes/index.vue

@@ -20,9 +20,8 @@
       <byForm :formConfig="formConfig" :formOption="formOption" v-model="formData.data" :rules="rules" ref="byform">
         <template #slot>
           <div>
-            <el-upload v-model:fileList="fileList" class="upload-demo" action="https://winfaster.obs.cn-south-1.myhuaweicloud.com" :limit="3"
-                       :data="uploadData" :on-preview="handlePreview" :on-remove="handleRemove" :on-success="handleSuccess"
-                       :before-upload="handleBeforeUpload" accept=".pdf">
+            <el-upload v-model:fileList="fileList" class="upload-demo" :action="uploadUrl" :limit="3" :data="uploadData" :on-preview="handlePreview"
+                       :on-remove="handleRemove" :on-success="handleSuccess" :before-upload="handleBeforeUpload" accept=".pdf">
               <el-button type="primary">点击上传</el-button>
               <template #file>
                 <div>

+ 8 - 8
src/views/publicModule/companyConfig/index.vue

@@ -79,8 +79,8 @@
             <el-row style="width: 100%">
               <el-col :span="6">
                 <el-form-item label="企业logo">
-                  <el-upload class="avatar-uploader" action="https://winfaster.obs.cn-south-1.myhuaweicloud.com" :data="uploadDataOne"
-                             :show-file-list="false" :on-success="enterpriseLogoListSuccess" :before-upload="uploadFileOne">
+                  <el-upload class="avatar-uploader" :action="uploadUrl" :data="uploadDataOne" :show-file-list="false"
+                             :on-success="enterpriseLogoListSuccess" :before-upload="uploadFileOne">
                     <el-image v-if="formData.data.enterpriseLogoList && formData.data.enterpriseLogoList.length > 0"
                               :src="formData.data.enterpriseLogoList[0].fileUrl" fit="scale-down" class="avatar" />
                     <el-icon v-else class="avatar-uploader-icon">
@@ -95,8 +95,8 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label="法人签名">
-                  <el-upload class="avatar-uploader" action="https://winfaster.obs.cn-south-1.myhuaweicloud.com" :data="uploadDataTwo"
-                             :show-file-list="false" :on-success="larSignListSuccess" :before-upload="uploadFileTwo">
+                  <el-upload class="avatar-uploader" :action="uploadUrl" :data="uploadDataTwo" :show-file-list="false"
+                             :on-success="larSignListSuccess" :before-upload="uploadFileTwo">
                     <el-image v-if="formData.data.larSignList && formData.data.larSignList.length > 0" :src="formData.data.larSignList[0].fileUrl"
                               fit="scale-down" class="avatar" />
                     <el-icon v-else class="avatar-uploader-icon">
@@ -111,8 +111,8 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label="公章">
-                  <el-upload class="avatar-uploader" action="https://winfaster.obs.cn-south-1.myhuaweicloud.com" :data="uploadDataThree"
-                             :show-file-list="false" :on-success="officialSealListSuccess" :before-upload="uploadFileThree">
+                  <el-upload class="avatar-uploader" :action="uploadUrl" :data="uploadDataThree" :show-file-list="false"
+                             :on-success="officialSealListSuccess" :before-upload="uploadFileThree">
                     <el-image v-if="formData.data.officialSealList && formData.data.officialSealList.length > 0"
                               :src="formData.data.officialSealList[0].fileUrl" fit="scale-down" class="avatar" />
                     <el-icon v-else class="avatar-uploader-icon">
@@ -127,8 +127,8 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label="合同章">
-                  <el-upload class="avatar-uploader" action="https://winfaster.obs.cn-south-1.myhuaweicloud.com" :data="uploadDataFour"
-                             :show-file-list="false" :on-success="contractSealListSuccess" :before-upload="uploadFileFour">
+                  <el-upload class="avatar-uploader" :action="uploadUrl" :data="uploadDataFour" :show-file-list="false"
+                             :on-success="contractSealListSuccess" :before-upload="uploadFileFour">
                     <el-image v-if="formData.data.contractSealList && formData.data.contractSealList.length > 0"
                               :src="formData.data.contractSealList[0].fileUrl" fit="scale-down" class="avatar" />
                     <el-icon v-else class="avatar-uploader-icon">

+ 1 - 2
src/views/purchaseManage/purchaseManage/handoverSlip/index.vue

@@ -118,8 +118,7 @@
         </template>
         <template #file>
           <div style="width: 100%">
-            <el-upload v-model:fileList="productRow.data.fileList" action="https://winfaster.obs.cn-south-1.myhuaweicloud.com" multiple
-                       :on-preview="onPreviewFile">
+            <el-upload v-model:fileList="productRow.data.fileList" :action="uploadUrl" multiple :on-preview="onPreviewFile">
             </el-upload>
           </div>
         </template>

+ 1 - 2
src/views/purchaseManage/purchaseManage/handoverSlipOne/index.vue

@@ -36,8 +36,7 @@
         </template>
         <template #file>
           <div style="width: 100%">
-            <el-upload v-model:fileList="productRow.data.fileList" action="https://winfaster.obs.cn-south-1.myhuaweicloud.com" multiple
-                       :on-preview="onPreviewFile">
+            <el-upload v-model:fileList="productRow.data.fileList" :action="uploadUrl" multiple :on-preview="onPreviewFile">
             </el-upload>
           </div>
         </template>

+ 38 - 5
src/views/purchaseManage/purchaseManage/purchase/index.vue

@@ -80,9 +80,8 @@
 
         <template #fileSlot>
           <div>
-            <el-upload v-model:fileList="fileList" class="upload-demo" action="https://winfaster.obs.cn-south-1.myhuaweicloud.com" :limit="3"
-                       :data="uploadData" :on-preview="handlePreview" :on-remove="handleRemove" :on-success="handleSuccess"
-                       :before-upload="handleBeforeUpload" accept=".pdf">
+            <el-upload v-model:fileList="fileList" class="upload-demo" :action="uploadUrl" :limit="3" :data="uploadData" :on-preview="handlePreview"
+                       :on-remove="handleRemove" :on-success="handleSuccess" :before-upload="handleBeforeUpload" accept=".pdf">
               <el-button type="primary">选择</el-button>
               <template #file>
                 <div>
@@ -114,10 +113,13 @@ import byForm from "@/components/byForm/index";
 import $bus from "@/bus/index.js";
 
 import { getToken } from "@/utils/auth";
+import { computed } from "vue";
 const { proxy } = getCurrentInstance();
 const materialUnit = computed(
   () => proxy.useUserStore().allDict["material_unit"]
 );
+// const treeData = ref([]);
+const companyData = ref([]);
 const uploadFileUrl = ref(import.meta.env.VITE_APP_BASE_API + "/common/upload"); // 上传文件服务器地址
 const headers = ref({ Authorization: "Bearer " + getToken() });
 const uploadData = ref({});
@@ -138,7 +140,7 @@ let fileList = ref([]);
 let rules = ref({
   name: [{ required: true, message: "请输入供应商名称", trigger: "blur" }],
 });
-const selectConfig = reactive([
+const selectConfig = computed(() => [
   {
     label: "状态",
     prop: "status",
@@ -153,6 +155,11 @@ const selectConfig = reactive([
       },
     ],
   },
+  {
+    label: "归属公司",
+    prop: "companyId",
+    data: companyData.value,
+  },
 ]);
 const config = computed(() => {
   return [
@@ -163,7 +170,13 @@ const config = computed(() => {
         width: 60,
       },
     },
-
+    {
+      attrs: {
+        label: "归属公司",
+        prop: "companyName",
+        width: 130,
+      },
+    },
     {
       attrs: {
         label: "单号",
@@ -516,6 +529,26 @@ const handleClickFile = (file) => {
   window.open(file.fileUrl, "_blank");
 };
 
+const getDict = () => {
+  proxy
+    .get("/tenantDept/list", {
+      pageNum: 1,
+      pageSize: 9999,
+      keyword: "",
+      tenantId: proxy.useUserStore().user.tenantId,
+      type: 0,
+    })
+    .then((res) => {
+      companyData.value = res.data.map((x) => ({
+        ...x,
+        label: x.deptName,
+        value: x.deptId,
+      }));
+      // treeData.value = proxy.handleTree(res.data, "deptId");
+    });
+};
+getDict();
+
 onMounted(() => {
   $bus.on("refreshTableData", () => {
     getList();

+ 2 - 2
src/views/purchaseManage/purchaseManage/purchaseDocumentary/index.vue

@@ -138,8 +138,8 @@
         </template>
         <template #file>
           <div style="width: 100%">
-            <el-upload v-model:fileList="fileList" action="https://winfaster.obs.cn-south-1.myhuaweicloud.com" :data="uploadData" multiple
-                       :before-upload="uploadFile" :on-preview="onPreviewFile">
+            <el-upload v-model:fileList="fileList" :action="uploadUrl" :data="uploadData" multiple :before-upload="uploadFile"
+                       :on-preview="onPreviewFile">
               <el-button>选择</el-button>
             </el-upload>
           </div>

+ 35 - 3
src/views/purchaseManage/purchaseManage/subscribe/index.vue

@@ -71,9 +71,8 @@
 
         <template #fileSlot>
           <div>
-            <el-upload v-model:fileList="fileList" class="upload-demo" action="https://winfaster.obs.cn-south-1.myhuaweicloud.com" :limit="3"
-                       :data="uploadData" :on-preview="handlePreview" :on-remove="handleRemove" :on-success="handleSuccess"
-                       :before-upload="handleBeforeUpload" accept=".pdf">
+            <el-upload v-model:fileList="fileList" class="upload-demo" :action="uploadUrl" :limit="3" :data="uploadData" :on-preview="handlePreview"
+                       :on-remove="handleRemove" :on-success="handleSuccess" :before-upload="handleBeforeUpload" accept=".pdf">
               <el-button type="primary">选择</el-button>
               <template #file>
                 <div>
@@ -109,6 +108,7 @@ const { proxy } = getCurrentInstance();
 const materialUnit = computed(
   () => proxy.useUserStore().allDict["material_unit"]
 );
+const companyData = ref([]);
 const uploadFileUrl = ref(import.meta.env.VITE_APP_BASE_API + "/common/upload"); // 上传文件服务器地址
 const headers = ref({ Authorization: "Bearer " + getToken() });
 const uploadData = ref({});
@@ -158,11 +158,23 @@ const selectConfig = computed(() => [
     prop: "status",
     data: statusData.value,
   },
+  {
+    label: "归属公司",
+    prop: "companyId",
+    data: companyData.value,
+  },
 ]);
 const config = computed(() => {
   return [
     {
       attrs: {
+        label: "归属公司",
+        prop: "companyName",
+        width: 130,
+      },
+    },
+    {
+      attrs: {
         label: "申购单号",
         prop: "subscribeCode",
         width: 150,
@@ -465,6 +477,26 @@ const handleClose = (index) => {
 
 getList();
 
+const getDict = () => {
+  proxy
+    .get("/tenantDept/list", {
+      pageNum: 1,
+      pageSize: 9999,
+      keyword: "",
+      tenantId: proxy.useUserStore().user.tenantId,
+      type: 0,
+    })
+    .then((res) => {
+      companyData.value = res.data.map((x) => ({
+        ...x,
+        label: x.deptName,
+        value: x.deptId,
+      }));
+      // treeData.value = proxy.handleTree(res.data, "deptId");
+    });
+};
+getDict();
+
 onMounted(() => {
   $bus.on("refreshTableData", () => {
     getList();

+ 2 - 2
src/views/purchaseManage/purchasePayment/invoice/index.vue

@@ -21,8 +21,8 @@
         </template>
         <template #file>
           <div style="width: 100%">
-            <el-upload v-model:fileList="fileList" action="https://winfaster.obs.cn-south-1.myhuaweicloud.com" :data="uploadData" multiple
-                       :before-upload="uploadFile" :on-preview="onPreviewFile">
+            <el-upload v-model:fileList="fileList" :action="uploadUrl" :data="uploadData" multiple :before-upload="uploadFile"
+                       :on-preview="onPreviewFile">
               <el-button>上传文件</el-button>
             </el-upload>
           </div>

+ 44 - 1
src/views/purchaseManage/supplier/supplier/index.vue

@@ -112,6 +112,8 @@ const supplierType = computed(
 );
 const loading = ref(false);
 const submitLoading = ref(false);
+const treeData = ref([]);
+const companyData = ref([]);
 const sourceList = ref({
   data: [],
   pagination: {
@@ -126,6 +128,7 @@ let dialogVisible = ref(false);
 let modalType = ref("add");
 const uploadData = ref({});
 let rules = ref({
+  companyId: [{ required: true, message: "请选择归属公司", trigger: "change" }],
   name: [{ required: true, message: "请输入供应商名称", trigger: "blur" }],
   type: [{ required: true, message: "请选择供应商类型", trigger: "change" }],
   countryId: [{ required: true, message: "请选择国家", trigger: "change" }],
@@ -143,11 +146,23 @@ const selectConfig = computed(() => [
     prop: "type",
     data: supplierType.value,
   },
+  {
+    label: "归属公司",
+    prop: "companyId",
+    data: companyData.value,
+  },
 ]);
 const config = computed(() => {
   return [
     {
       attrs: {
+        label: "归属公司",
+        prop: "companyName",
+        width: 130,
+      },
+    },
+    {
+      attrs: {
         label: "供应商类型",
         prop: "type",
         width: 120,
@@ -264,6 +279,15 @@ const formConfig = computed(() => {
       title: "基本信息",
     },
     {
+      type: "treeSelect",
+      prop: "companyId",
+      label: "归属公司",
+      data: treeData.value,
+      propsTreeLabel: "deptName",
+      propsTreeValue: "deptId",
+      itemWidth: 100,
+    },
+    {
       type: "select",
       prop: "type",
       label: "供应商类型",
@@ -348,6 +372,7 @@ const formConfig = computed(() => {
     },
   ];
 });
+
 const getList = async (req) => {
   sourceList.value.pagination = { ...sourceList.value.pagination, ...req };
   loading.value = true;
@@ -449,7 +474,25 @@ const getCityData = (id, type, flag) => {
     }
   });
 };
-
+const getDict = () => {
+  proxy
+    .get("/tenantDept/list", {
+      pageNum: 1,
+      pageSize: 9999,
+      keyword: "",
+      tenantId: proxy.useUserStore().user.tenantId,
+      type: 0,
+    })
+    .then((res) => {
+      companyData.value = res.data.map((x) => ({
+        ...x,
+        label: x.deptName,
+        value: x.deptId,
+      }));
+      treeData.value = proxy.handleTree(res.data, "deptId");
+    });
+};
+getDict();
 getCityData("0");
 getList();
 </script>

+ 2 - 3
src/views/salesMange/saleContract/claim/index.vue

@@ -60,9 +60,8 @@
         </template>
         <template #fileSlot>
           <div>
-            <el-upload v-model:fileList="fileList" :show-file-list="false" class="upload-demo"
-                       action="https://winfaster.obs.cn-south-1.myhuaweicloud.com" :data="uploadData" :on-preview="handlePreview"
-                       :on-remove="handleRemove" :on-success="handleSuccess" :before-upload="handleBeforeUpload">
+            <el-upload v-model:fileList="fileList" :show-file-list="false" class="upload-demo" :action="uploadUrl" :data="uploadData"
+                       :on-preview="handlePreview" :on-remove="handleRemove" :on-success="handleSuccess" :before-upload="handleBeforeUpload">
               <el-button type="primary">选择</el-button>
             </el-upload>
             <div>

+ 2 - 2
src/views/salesMange/saleContract/salesDocumentary/index.vue

@@ -138,8 +138,8 @@
         </template>
         <template #file>
           <div style="width: 100%">
-            <el-upload v-model:fileList="fileList" action="https://winfaster.obs.cn-south-1.myhuaweicloud.com" :data="uploadData" multiple
-                       :before-upload="uploadFile" :on-preview="onPreviewFile">
+            <el-upload v-model:fileList="fileList" :action="uploadUrl" :data="uploadData" multiple :before-upload="uploadFile"
+                       :on-preview="onPreviewFile">
               <el-button>选择</el-button>
             </el-upload>
           </div>

+ 2 - 2
src/views/salesMange/saleContract/serviceContract/index.vue

@@ -69,8 +69,8 @@
         </template>
         <template #file>
           <div style="width: 100%">
-            <el-upload v-model:fileList="fileList" action="https://winfaster.obs.cn-south-1.myhuaweicloud.com" :data="uploadData" multiple
-                       :before-upload="uploadFile" :on-preview="onPreviewFile">
+            <el-upload v-model:fileList="fileList" :action="uploadUrl" :data="uploadData" multiple :before-upload="uploadFile"
+                       :on-preview="onPreviewFile">
               <el-button>选择</el-button>
             </el-upload>
           </div>

+ 2 - 2
src/views/salesMange/shipmentMange/document/index.vue

@@ -94,8 +94,8 @@
         </template>
         <template #file>
           <div style="width: 100%">
-            <el-upload v-model:fileList="fileList" action="https://winfaster.obs.cn-south-1.myhuaweicloud.com" :data="uploadData" multiple
-                       :before-upload="uploadFile" :on-preview="onPreviewFile">
+            <el-upload v-model:fileList="fileList" :action="uploadUrl" :data="uploadData" multiple :before-upload="uploadFile"
+                       :on-preview="onPreviewFile">
               <el-button>选择</el-button>
             </el-upload>
           </div>

+ 2 - 2
src/views/systemTenant/tenant/logoConfiguration/index.vue

@@ -2,8 +2,8 @@
   <div class="pageIndexClass">
     <div style="border-left: 3px solid #0084ff; padding-left: 8px">Logo 配置</div>
     <div style="padding: 32px 0 16px 0">
-      <el-upload class="avatar-uploader" action="https://winfaster.obs.cn-south-1.myhuaweicloud.com" :data="uploadData" :show-file-list="false"
-                 :on-success="handleAvatarSuccess" :before-upload="uploadFile" accept=".png">
+      <el-upload class="avatar-uploader" :action="uploadUrl" :data="uploadData" :show-file-list="false" :on-success="handleAvatarSuccess"
+                 :before-upload="uploadFile" accept=".png">
         <el-button type="primary">点击上传</el-button>
         <!-- <img v-if="imageUrl" :src="imageUrl" class="avatar" /> -->
         <!-- <el-image v-if="imageUrl" style="width: 120px; height: 30px" :src="imageUrl" fit="scale-down" />