Merge branch 'milestone-20251215-多语言二期2' of http://39.101.133.168:8807/huangqizhen/gold-vue into milestone-20251215-多语言二期2

src/views/moneyManage/executor/executor.vue

@@ -12,7 +12,7 @@
       </div>
       <div class="search">
         <el-text size="large" style="width:4vw;">{{ t('common.productName') }}</el-text>
-        <el-cascader v-model="searchForm.goodsName" :props="{ multiple: true, emitPath: false }" :show-all-levels="false" collapse-tags collapse-tags-tooltip :options="productList" style="width: 10vw;" :placeholder="t('common.productNamePlaceholder')" clearable />
+        <el-cascader v-model="searchForm.goodsName" :props="{ multiple: false, emitPath: false }" :show-all-levels="false" collapse-tags collapse-tags-tooltip :options="productList" style="width: 10vw;" :placeholder="t('common.productNamePlaceholder')" clearable />
       </div>
       <div class="search" v-if="adminData.markets === t('common.markets.headquarter')">
         <el-text size="large" style="width:4vw;">{{ t('common.market') }}</el-text>
@@ -63,7 +63,13 @@
       <el-table-column prop="name" :label="t('common_list.name')" width="120" fixed="left" show-overflow-tooltip />
       <el-table-column prop="marketName" :label="t('common_list.market')" width="120" />
       <el-table-column prop="goodsName" :label="t('common_list.productName')" width="120" />
-      <el-table-column prop="goodsNum" :label="t('common_list.productNum')" width="120" />
+      <el-table-column prop="goodsNum" :label="t('common_list.productNum')" width="130px">
+                            <template #default="scope">
+                                <span v-if="scope.row.goodsName == t('common_list.goldRecharge')">{{
+                                    scope.row.permanentGold }} {{ t('cash.unit') }}</span>
+                                <span v-else>{{ scope.row.goodsNum }} {{ scope.row.numUnit }}</span>
+                            </template>
+       </el-table-column>
       <el-table-column prop="refundModel" :label="t('common_list.refundModel')" width="140">
         <template #default="scope">
           {{ scope.row.refundModel === 1 ? t('common_list.refundModelPart') : t('common_list.refundModelAll') }}
@@ -197,8 +203,8 @@
             show-word-limit clearable />
         </div>
         <div class="dialog-item">
-          <el-text style="width:4vw;">退款理由</el-text>
-          <el-input v-model="editRow.rejectReason" style="width:10vw;" :row="3" disabled maxlength="100" type="textarea"
+          <el-text style="width:4vw;">{{ t('common_add.refundReason') }}</el-text>
+          <el-input v-model="editRow.refundReason" style="width:10vw;" :row="3" disabled maxlength="100" type="textarea"
             show-word-limit clearable />
         </div>
       </div>
@@ -304,8 +310,8 @@ const getRefund = async function () {
       statusesParam.value = [40, 41]
     }
 
-    const goodsName = searchForm.value.goodsName && searchForm.value.goodsName.length > 0
-      ? searchForm.value.goodsName: []
+     let goodsName = searchForm.value.goodsName && searchForm.value.goodsName.length > 0
+            ? [searchForm.value.goodsName] : []
 
     if (searchForm.value.jwcode) {
       const isPositiveInteger = /^[1-9]\d*$/.test(searchForm.value.jwcode);

src/views/moneyManage/financialAccount/cashFlow.vue

@@ -93,7 +93,7 @@ const fetchData = async () => {
       pageSize: queryParams.pageSize,
       fundsDTO: {
         jwcode: queryParams.jwcode,
-        markets: queryParams.markets,
+        localMarket:queryParams.markets,
         startTime: queryParams.timeRange?.[0] ? dayjs(queryParams.timeRange[0]).format('YYYY-MM-DD HH:mm:ss') : '',
         endTime: queryParams.timeRange?.[1] ? dayjs(queryParams.timeRange[1]).format('YYYY-MM-DD HH:mm:ss') : '',
         payType: queryParams.payType,

src/views/moneyManage/receiveDetail/receiveFinance.vue

@@ -129,8 +129,8 @@
                         <el-table-column prop="goodNum" :label="t('common_list.productNum')" width="130px">
                             <template #default="scope">
                                 <span v-if="scope.row.goodsName == t('common_list.goldRecharge')">{{
-                                    scope.row.permanentGold }}</span>
-                                <span v-else>{{ scope.row.goodNum }}</span>
+                                    scope.row.permanentGold }} {{ t('cash.unit') }}</span>
+                                <span v-else>{{ scope.row.goodNum }} {{ scope.row.numUnit }}</span>
                             </template>
                         </el-table-column>
                         <el-table-column prop="paymentCurrency" :label="t('common_list.payCurrency')" width="120px" />
@@ -445,11 +445,11 @@
                             </div>
                         </div>
                         <el-form-item :label="t('common_add.payCurrency')">
-                            <CurrencySelect :disabled="!ifOnline" v-model="editFormData.paymentCurrency"
+                            <CurrencySelect :disabled="ifOnline" v-model="editFormData.paymentCurrency"
                                 :items="customOptions" :placeholder="t('common_add.payCurrency')" />
                         </el-form-item>
                         <el-form-item :label="t('common_add.payAmount')">
-                            <el-input :disabled="!ifOnline" v-model="editFormData.paymentAmount"
+                            <el-input :disabled="ifOnline" v-model="editFormData.paymentAmount"
                                 :placeholder="t('common_add.payAmount')" />
                         </el-form-item>
                         <el-form-item :label="t('common_add.payMethod')">
@@ -1191,7 +1191,11 @@ watch(auditFormisible, (val) => {
 const openEditForm = (row) => {
     console.log('row.aaa', row.handlingCharge);
 
-    editFormData.value = { ...row };
+    editFormData.value = { 
+        ...row,
+        paymentCurrencyOrig: row.paymentCurrency,
+        paymentAmountOrig: row.paymentAmount,
+     };
     // 区分金币产品与普通产品
     if (row.goodsName === t('cash.coinRecharge')) isEditGold.value = true;
     else isEditGold.value = false;
@@ -1235,7 +1239,9 @@ const submitEditForm = async () => {
                 receivedCurrency: CurrencyForId(editFormData.value.receivedCurrency),
                 receivedAmount: editFormData.value.receivedAmount * 100 || null, // 转为分单位
                 receivedTime: editFormData.value.receivedTime,
-                receivedRemark: editFormData.value.receivedRemark || ''
+                receivedRemark: editFormData.value.receivedRemark || '',
+                paymentCurrencyOrig: editFormData.value.paymentCurrencyOrig,
+                paymentAmountOrig: CurrencyForId(editFormData.value.paymentAmountOrig),
             }
         });
 

src/views/moneyManage/receiveDetail/receiveManage.vue

@@ -129,8 +129,8 @@
                         <el-table-column prop="goodNum" :label="t('common_list.productNum')" width="130px">
                             <template #default="scope">
                                 <span v-if="scope.row.goodsName == t('common_list.goldRecharge')">{{
-                                    scope.row.permanentGold }}</span>
-                                <span v-else>{{ scope.row.goodNum }}</span>
+                                    scope.row.permanentGold }} {{ t('cash.unit') }}</span>
+                                <span v-else>{{ scope.row.goodNum }} {{ scope.row.numUnit }}</span>
                             </template>
                         </el-table-column>
                         <el-table-column prop="paymentCurrency" :label="t('common_list.payCurrency')" width="120px" />
@@ -445,12 +445,12 @@
                             </div>
                         </div>
                         <el-form-item :label="t('common_add.payCurrency')">
-                            <CurrencySelect :disabled="!ifOnline" v-model="editFormData.paymentCurrency"
+                            <CurrencySelect :disabled="ifOnline" v-model="editFormData.paymentCurrency"
                                 :items="customOptions" :placeholder="t('common_add.payCurrency')" />
                         </el-form-item>
-                        <el-form-item :label="t('common_add.paymentAmount')">
-                            <el-input :disabled="!ifOnline" v-model="editFormData.paymentAmount"
-                                :placeholder="t('common_add.paymentAmount')" />
+                        <el-form-item :label="t('common_add.payAmount')">
+                            <el-input :disabled="ifOnline" v-model="editFormData.paymentAmount"
+                                :placeholder="t('common_add.payAmount')" />
                         </el-form-item>
                         <el-form-item :label="t('common_add.payMethod')">
                             <el-select disabled="true" v-model="editFormData.payType"
@@ -822,7 +822,7 @@ const exportExcel = async function () {
     // }
 
     const cashRoleId = '1';
-    const submitterMarket = normalizeSubmitterMarket(adminData.value.markets);
+    const submitterMarket = adminData.value.markets;
     searchData.value.status = 46;
     const params = {
         ...pageInfo.value,
@@ -1191,7 +1191,11 @@ watch(auditFormisible, (val) => {
 const openEditForm = (row) => {
     console.log('row.aaa', row.handlingCharge);
 
-    editFormData.value = { ...row };
+    editFormData.value = { 
+        ...row,
+        paymentCurrencyOrig: row.paymentCurrency,
+        paymentAmountOrig: row.paymentAmount,
+     };
     // 区分金币产品与普通产品
     if (row.goodsName === t('cash.coinRecharge')) isEditGold.value = true;
     else isEditGold.value = false;
@@ -1235,7 +1239,9 @@ const submitEditForm = async () => {
                 receivedCurrency: CurrencyForId(editFormData.value.receivedCurrency),
                 receivedAmount: editFormData.value.receivedAmount * 100 || null, // 转为分单位
                 receivedTime: editFormData.value.receivedTime,
-                receivedRemark: editFormData.value.receivedRemark || ''
+                receivedRemark: editFormData.value.receivedRemark || '',
+                paymentCurrencyOrig: editFormData.value.paymentCurrencyOrig,
+                paymentAmountOrig: CurrencyForId(editFormData.value.paymentAmountOrig),
             }
         });
 
@@ -1705,7 +1711,7 @@ const handlePagination = (type, val) => {
     }
 
     :deep(.adddialog .el-form-item__label) {
-        min-width: 80px;
+        min-width: 100px;
         width: auto;
         font-weight: 800;
         padding-bottom: 15px;

src/views/moneyManage/receiveDetail/receiveService.vue

@@ -97,15 +97,8 @@
                         <el-table-column prop="goodNum" :label="t('common_list.productNum')" width="130px">
                             <template #default="scope">
                                 <span v-if="scope.row.goodsName == t('common_list.goldRecharge')">{{
-                                    scope.row.permanentGold }}</span>
-                                <span v-else>{{ scope.row.goodNum }}</span>
-                            </template>
-                        </el-table-column>
-                        <el-table-column prop="numUnit" :label="t('common_add.numUnit')" width="130px">
-                            <template #default="scope">
-                                <span v-if="scope.row.goodsName == t('common_list.goldRecharge')">{{
-                                    scope.row.permanentGold }}</span>
-                                <span v-else>{{ scope.row.goodNum }}</span>
+                                    scope.row.permanentGold }} {{ t('cash.unit') }}</span>
+                                <span v-else>{{ scope.row.goodNum }} {{ scope.row.numUnit }}</span>
                             </template>
                         </el-table-column>
                         <el-table-column prop="paymentCurrency" :label="t('common_list.payCurrency')" width="120px" />

src/views/moneyManage/refundDetail/refundCharge.vue

@@ -73,7 +73,13 @@
                 show-overflow-tooltip />
             <el-table-column prop="marketName" :label="t('common_list.market')" width="120" />
             <el-table-column prop="goodsName" :label="t('common_list.productName')" width="130" show-overflow-tooltip />
-            <el-table-column prop="goodsNum" :label="t('common_list.productNum')" width="120" />
+            <el-table-column prop="goodsNum" :label="t('common_list.productNum')" width="130px">
+                            <template #default="scope">
+                                <span v-if="scope.row.goodsName == t('common_list.goldRecharge')">{{
+                                    scope.row.permanentGold }} {{ t('cash.unit') }}</span>
+                                <span v-else>{{ scope.row.goodsNum }} {{ scope.row.numUnit }}</span>
+                            </template>
+            </el-table-column>
             <el-table-column prop="refundModel" :label="t('common_list.refundModel')" width="120">
                 <template #default="scope">
                     {{ scope.row.refundModel === 1 ? t('common_list.refundModelPart') : t('common_list.refundModelAll')

src/views/moneyManage/refundDetail/refundFinance.vue

@@ -65,7 +65,13 @@
             <el-table-column prop="name" :label="t('common_list.name')" width="120" fixed="left" show-overflow-tooltip />
             <el-table-column prop="marketName" :label="t('common_list.market')" width="120" />
             <el-table-column prop="goodsName" :label="t('common_list.productName')" width="130" show-overflow-tooltip />
-            <el-table-column prop="goodsNum" :label="t('common_list.productNum')" width="120" />
+            <el-table-column prop="goodsNum" :label="t('common_list.productNum')" width="130px">
+                            <template #default="scope">
+                                <span v-if="scope.row.goodsName == t('common_list.goldRecharge')">{{
+                                    scope.row.permanentGold }} {{ t('cash.unit') }}</span>
+                                <span v-else>{{ scope.row.goodsNum }} {{ scope.row.numUnit }}</span>
+                            </template>
+            </el-table-column>
             <el-table-column prop="refundModel" :label="t('common_list.refundModel')" width="120">
                 <template #default="scope">
                     {{ scope.row.refundModel === 1 ? t('common_list.refundModelPart') : t('common_list.refundModelAll') }}

src/views/moneyManage/refundDetail/refundHeader.vue

@@ -66,7 +66,13 @@
             <el-table-column prop="jwcode" :label="t('common_list.name')" width="120" fixed="left" show-overflow-tooltip />
             <el-table-column prop="marketName" :label="t('common_list.market')" width="120" />
             <el-table-column prop="goodsName" :label="t('common_list.productName')" width="130" show-overflow-tooltip />
-            <el-table-column prop="goodsNum" :label="t('common_list.productNum')" width="120" />
+            <el-table-column prop="goodsNum" :label="t('common_list.productNum')" width="130px">
+                            <template #default="scope">
+                                <span v-if="scope.row.goodsName == t('common_list.goldRecharge')">{{
+                                    scope.row.permanentGold }} {{ t('cash.unit') }}</span>
+                                <span v-else>{{ scope.row.goodsNum }} {{ scope.row.numUnit }}</span>
+                            </template>
+            </el-table-column>
             <el-table-column prop="refundModel" :label="t('common_list.refundModel')" width="120">
                 <template #default="scope">
                     {{ scope.row.refundModel === 1 ? t('common_list.refundModelPart') : t('common_list.refundModelAll') }}
@@ -485,6 +491,10 @@ const executorList = ref([
     {
         value: '90047947',
         label: '宋彤彤'
+    },
+    {
+        value: '90047860',
+        label: 'zy'
     }
 ])
 // 查全部
@@ -558,6 +568,10 @@ const handlePass = async function () {
         ElMessage.error(t('elmessage.noPermission'))
         return
     }
+    if (!addForm.value.executor) {
+        ElMessage.error(t('elmessage.pleaseSelectExecutor'))
+        return
+    }
     try {
         const params = {
             id: auditRow.value.id,

src/views/moneyManage/refundDetail/refundService.vue

@@ -14,7 +14,7 @@
             </div>
             <div class="item1">
                 <el-text size="large" style="width:4vw;">{{ t('common.productName') }}</el-text>
-                <el-cascader v-model="searchForm.goodsName" :props="{ multiple: true, emitPath: false }" :show-all-levels="false" collapse-tags collapse-tags-tooltip :options="productList" style="width: 10vw;" :placeholder="t('common.productNamePlaceholder')" clearable />
+                <el-cascader v-model="searchForm.goodsName" :props="{ multiple: false, emitPath: false }" :show-all-levels="false" :options="productList" style="width: 10vw;" :placeholder="t('common.productNamePlaceholder')" clearable />
             </div>
             <div class="item1" v-if="isHeadquarters">
                 <el-text size="large" style="width:4vw;">{{ t('common.market') }}</el-text>
@@ -69,7 +69,13 @@
             <el-table-column prop="marketName" :label="t('common_list.market')" width="120" />
             <el-table-column prop="activity" :label="t('common_list.activity')" width="120px" show-overflow-tooltip />
             <el-table-column prop="goodsName" :label="t('common_list.productName')" width="130" show-overflow-tooltip />
-            <el-table-column prop="goodsNum" :label="t('common_list.productNum')" width="120" />
+           <el-table-column prop="goodsNum" :label="t('common_list.productNum')" width="130px">
+                            <template #default="scope">
+                                <span v-if="scope.row.goodsName == t('common_list.goldRecharge')">{{
+                                    scope.row.permanentGold }} {{ t('cash.unit') }}</span>
+                                <span v-else>{{ scope.row.goodsNum }} {{ scope.row.numUnit }}</span>
+                            </template>
+            </el-table-column>
             <el-table-column prop="paymentCurrency" :label="t('common_add.payCurrency')" width="120" />
             <el-table-column prop="paymentAmount" :label="t('common_add.payAmount')" width="120" />
             <el-table-column prop="payType" :label="t('common_add.payMethod')" width="140" />
@@ -322,8 +328,10 @@ const getRefund = async function () {
             statusParam.value = [12, 22, 32]
         }
 
-        const goodsName = searchForm.value.goodsName && searchForm.value.goodsName.length > 0
-            ? searchForm.value.goodsName : []
+        console.log('goodsName', searchForm.value.goodsName);
+        
+        let goodsName = searchForm.value.goodsName && searchForm.value.goodsName.length > 0
+            ? [searchForm.value.goodsName] : []
 
         if (searchForm.value.jwcode) {
             const isPositiveInteger = /^[1-9]\d*$/.test(searchForm.value.jwcode);