Parcourir la source

到账认领增加币种展示

cz il y a 9 mois
Parent
commit
c5739083a5

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

@@ -397,7 +397,7 @@
         </div>
       </template>
       <template #file>
-        <div style="width: 100%">
+        <div style="width: 50%">
           <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>
@@ -405,7 +405,7 @@
         </div>
       </template>
       <template #indication>
-        <div style="width: 100%">
+        <div style="width: 50%">
           <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>

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

@@ -390,7 +390,7 @@
         </div>
       </template>
       <template #file>
-        <div style="width: 100%">
+        <div style="width: 50%">
           <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>
@@ -398,7 +398,7 @@
         </div>
       </template>
       <template #indication>
-        <div style="width: 100%">
+        <div style="width: 50%">
           <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>

+ 11 - 44
src/views/EHSD/procurement/handoverSlipSampleEHSD/index.vue

@@ -1,25 +1,16 @@
 <template>
   <div class="tenant">
     <div class="content">
-      <byTable
-        :source="sourceList.data"
-        :pagination="sourceList.pagination"
-        :config="config"
-        :loading="loading"
-        highlight-current-row
-        :table-events="{
+      <byTable :source="sourceList.data" :pagination="sourceList.pagination" :config="config" :loading="loading" highlight-current-row :table-events="{
           select: selectRow,
           'select-all': selectRow,
-        }"
-        :action-list="[
+        }" :action-list="[
           {
             text: '采购',
             disabled: selectData.length === 0,
             action: () => clickPurchase(),
           },
-        ]"
-        @get-list="getList"
-      >
+        ]" @get-list="getList">
         <template #claimTime="{ item }">
           <div style="width: 100%">
             <span v-if="item.claimTime">{{ item.claimTime }}</span>
@@ -39,45 +30,19 @@
       </byTable>
     </div>
 
-    <el-dialog
-      title="交接单"
-      v-if="openAllFile"
-      v-model="openAllFile"
-      width="600"
-    >
-      <byForm
-        :formConfig="formConfig"
-        :formOption="formOption"
-        v-model="rowData"
-        ref="fileState"
-      >
+    <el-dialog title="交接单" v-if="openAllFile" v-model="openAllFile" width="600">
+      <byForm :formConfig="formConfig" :formOption="formOption" v-model="rowData" ref="fileState">
         <template #file>
           <div>
-            <div
-              v-for="(file, index) in rowData.fileList"
-              :key="index"
-              style="padding: 4px 0"
-            >
-              <a
-                style="color: #409eff; cursor: pointer"
-                @click="openFile(file.fileUrl)"
-                >{{ file.fileName }}</a
-              >
+            <div v-for="(file, index) in rowData.fileList" :key="index" style="padding: 4px 0">
+              <a style="color: #409eff; cursor: pointer" @click="openFile(file.fileUrl)">{{ file.fileName }}</a>
             </div>
           </div>
         </template>
         <template #indication>
           <div>
-            <div
-              v-for="(file, index) in rowData.packageFileList"
-              :key="index"
-              style="padding: 4px 0"
-            >
-              <a
-                style="color: #409eff; cursor: pointer"
-                @click="openFile(file.fileUrl)"
-                >{{ file.fileName }}</a
-              >
+            <div v-for="(file, index) in rowData.packageFileList" :key="index" style="padding: 4px 0">
+              <a style="color: #409eff; cursor: pointer" @click="openFile(file.fileUrl)">{{ file.fileName }}</a>
             </div>
           </div>
         </template>
@@ -94,6 +59,7 @@ import { computed, ref } from "vue";
 import byTable from "@/components/byTable/index";
 import byForm from "@/components/byForm/index";
 import moment from "moment";
+import useRefreshTableData from "@/hooks/refreshTableData";
 
 const { proxy } = getCurrentInstance();
 const sourceList = ref({
@@ -393,6 +359,7 @@ const getStatus = (row) => {
   }
   return str;
 };
+useRefreshTableData(getList);
 </script>
 
 <style lang="scss" scoped>

+ 2 - 0
src/views/purchaseManage/purchaseManage/purchase/index.vue

@@ -98,6 +98,7 @@ import byTable from "@/components/byTable/index";
 import byForm from "@/components/byForm/index";
 import { computed, defineComponent, ref } from "vue";
 import { getToken } from "@/utils/auth";
+import useRefreshTableData from "@/hooks/refreshTableData";
 
 const uploadFileUrl = ref(import.meta.env.VITE_APP_BASE_API + "/common/upload"); // 上传文件服务器地址
 const headers = ref({ Authorization: "Bearer " + getToken() });
@@ -462,6 +463,7 @@ const start = () => {
     });
   }
 };
+useRefreshTableData(getList);
 </script>
   
 <style lang="scss" scoped>

+ 12 - 4
src/views/salesMange/saleContract/claim/index.vue

@@ -14,7 +14,7 @@
       </template>
     </byTable>
 
-    <el-dialog title="认领" v-if="dialogVisible" v-model="dialogVisible" width="50%" v-loading="loading">
+    <el-dialog title="认领" v-if="dialogVisible" v-model="dialogVisible" width="60%" v-loading="loading">
       <byForm :formConfig="formConfig" :formOption="formOption" v-model="formData.data" :rules="rules" ref="byform">
         <template #detail>
           <div style="width: 100%">
@@ -23,14 +23,18 @@
               <el-table-column prop="contractCode" label="合同编码" width="140" />
               <el-table-column label="合同金额" width="140">
                 <template #default="{ row, $index }">
-                  {{ row.currency }}{{ moneyFormat(row.contractTotal, 2) }}
+                  {{ row.currency }} {{ moneyFormat(row.contractTotal, 2) }}
                 </template>
               </el-table-column>
               <el-table-column prop="sumContractNotClaimMoney" label="未结清金额" width="100" />
               <el-table-column prop="money" label="关联金额" min-width="150">
                 <template #default="{ row, $index }">
                   <el-form-item :prop="'claimContractList.' + $index + '.money'" :rules="rules.money" :inline-message="true">
-                    <el-input-number v-model="row.money" :precision="2" :controls="false" :min="0" onmousewheel="return false;" />
+                    <div style="display:flex">
+                      <div style="width:40px"> {{formData.data.currency}}</div>
+                      <el-input-number v-model="row.money" :precision="2" :controls="false" :min="0" onmousewheel="return false;"
+                                       style="width:calc(100% - 40px)" />
+                    </div>
                   </el-form-item>
                 </template>
               </el-table-column>
@@ -46,7 +50,11 @@
               <el-table-column prop="contractMoney" label="换算金额" min-width="150">
                 <template #default="{ row, $index }">
                   <el-form-item :prop="'claimContractList.' + $index + '.contractMoney'" :rules="rules.contractMoney" :inline-message="true">
-                    <el-input-number v-model="row.contractMoney" :precision="2" :controls="false" :min="0" onmousewheel="return false;" />
+                    <div>
+                      <div style="width:40px"> {{ row.currency }}</div>
+                    </div>
+                    <el-input-number v-model="row.contractMoney" :precision="2" :controls="false" :min="0" onmousewheel="return false;"
+                                     style="width:calc(100% - 40px)" />
                   </el-form-item>
                 </template>
               </el-table-column>