lxf 1 рік тому
батько
коміт
4f06a4204a

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

@@ -114,7 +114,6 @@
               </el-form-item>
             </template>
           </el-table-column>
-
           <el-table-column prop="zip" label="操作" width="100">
             <template #default="{ $index }">
               <el-button type="primary" link @click="handleRemove($index)">删除</el-button>
@@ -130,7 +129,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="单据数量" prop="quantity">
-            <el-input v-model="formData.data.quantity" placeholder="请输入" />
+            <el-input-number onmousewheel="return false;" v-model="formData.data.quantity" placeholder="请输入" style="width: 100%;" :precision="0" :controls="false" :min="0" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -418,4 +417,7 @@ defineExpose({
   margin-bottom: 5px;
   font-size: 14px;
 }
+::v-deep(.el-input-number .el-input__inner) {
+  text-align: left;
+}
 </style>

+ 103 - 61
src/views/finance/fundManage/funds/index.vue

@@ -49,7 +49,7 @@
             <div class="contentRow" style="width: 80px">发票类型</div>
             <div class="contentRow" style="width: calc(50% - 80px)"></div>
           </div>
-          <div class="baseRow" style="display: flex" v-if="printDetails.type == '2'">
+          <div class="baseRow" style="display: flex" v-if="printDetails.type == '3'">
             <div class="contentRow" style="width: 80px">预支单</div>
             <div class="contentRow" style="width: calc(100% - 80px)"></div>
           </div>
@@ -66,80 +66,112 @@
           <div class="specialRow">
             <span>请款明细</span>
           </div>
-          <div v-if="printDetails.accountRequestFundsDetailList && printDetails.accountRequestFundsDetailList.length > 0">
-            <div v-for="item in printDetails.accountRequestFundsDetailList" :key="item.id">
+          <div v-if="printDetails.type == '3'">
+            <div v-if="printDetails.accountRequestFundsDetailList && printDetails.accountRequestFundsDetailList.length > 0">
               <div class="baseRow" style="display: flex">
-                <div class="contentRow" style="width: 25%">费用类型</div>
-                <div class="contentRow" style="width: 25%">关联合同</div>
-                <div class="contentRow" style="width: 25%">款项说明</div>
-                <div class="contentRow" style="width: 25%">请款金额</div>
+                <div class="contentRow" style="width: 17%">费用类型</div>
+                <div class="contentRow" style="width: 17%">关联合同</div>
+                <div class="contentRow" style="width: 17%">预支金额</div>
+                <div class="contentRow" style="width: 32%">核销说明</div>
+                <div class="contentRow" style="width: 17%">核销金额</div>
               </div>
-              <div class="baseRow" style="display: flex">
-                <div class="contentRow" style="width: 25%">
-                  {{ dictDataEcho(item.costType, fundsCostType) }}
-                </div>
-                <div class="contentRow" style="width: 25%"></div>
-                <div class="contentRow" style="width: 25%">
-                  {{ item.remarks }}
-                </div>
-                <div class="contentRow" style="width: 25%">
-                  {{ item.amount }}
+              <div v-for="item in printDetails.accountRequestFundsDetailList" :key="item.id">
+                <div class="baseRow" style="display: flex">
+                  <div class="contentRow" style="width: 17%">
+                    {{ dictDataEcho(item.costType, fundsCostType) }}
+                  </div>
+                  <div class="contentRow" style="width: 17%">
+                    {{ item.contractCode }}
+                  </div>
+                  <div class="contentRow" style="width: 17%"></div>
+                  <div class="contentRow" style="width: 32%">
+                    {{ item.remarks }}
+                  </div>
+                  <div class="contentRow" style="width: 17%">
+                    {{ item.amount }}
+                  </div>
                 </div>
               </div>
             </div>
-          </div>
-          <div v-else>
-            <div class="baseRow" style="display: flex">
-              <div class="contentRow" style="width: 25%">费用类型</div>
-              <div class="contentRow" style="width: 25%">关联合同</div>
-              <div class="contentRow" style="width: 25%">款项说明</div>
-              <div class="contentRow" style="width: 25%">请款金额</div>
+            <div v-else>
+              <div class="baseRow" style="display: flex">
+                <div class="contentRow" style="width: 17%">费用类型</div>
+                <div class="contentRow" style="width: 17%">关联合同</div>
+                <div class="contentRow" style="width: 17%">预支金额</div>
+                <div class="contentRow" style="width: 32%">核销说明</div>
+                <div class="contentRow" style="width: 17%">核销金额</div>
+              </div>
+              <div class="baseRow" style="display: flex">
+                <div class="contentRow" style="width: 17%"></div>
+                <div class="contentRow" style="width: 17%"></div>
+                <div class="contentRow" style="width: 17%"></div>
+                <div class="contentRow" style="width: 32%"></div>
+                <div class="contentRow" style="width: 17%"></div>
+              </div>
             </div>
             <div class="baseRow" style="display: flex">
-              <div class="contentRow" style="width: 25%"></div>
-              <div class="contentRow" style="width: 25%"></div>
-              <div class="contentRow" style="width: 25%"></div>
-              <div class="contentRow" style="width: 25%"></div>
-            </div>
-          </div>
-          <div class="baseRow" style="display: flex">
-            <div class="contentRow" style="width: 80px">请款总额</div>
-            <div class="contentRow" style="width: calc(50% - 80px)">
-              {{ printDetails.total }}
-            </div>
-            <div class="contentRow" style="width: 80px">单证数量</div>
-            <div class="contentRow" style="width: calc(50% - 80px)">
-              {{ printDetails.quantity }}
+              <div class="contentRow" style="width: 80px">预支金额</div>
+              <div class="contentRow" style="width: calc(50% - 80px)"></div>
+              <div class="contentRow" style="width: 80px">核销总额</div>
+              <div class="contentRow" style="width: calc(50% - 80px)">{{ printDetails.total }}</div>
             </div>
-          </div>
-          <!-- <div v-if="printDetails.type == '2'">
             <div class="baseRow" style="display: flex">
-              <div class="contentRow" style="width: 17%">费用类型</div>
-              <div class="contentRow" style="width: 17%">关联合同</div>
-              <div class="contentRow" style="width: 17%">预支金额</div>
-              <div class="contentRow" style="width: 32%">核销说明</div>
-              <div class="contentRow" style="width: 17%">核销金额</div>
+              <div class="contentRow" style="width: 80px">差额</div>
+              <div class="contentRow" style="width: calc(50% - 80px)"></div>
+              <div class="contentRow" style="width: 80px">单证数量</div>
+              <div class="contentRow" style="width: calc(50% - 80px)">{{ printDetails.quantity }}</div>
             </div>
-            <div class="baseRow" style="display: flex">
-              <div class="contentRow" style="width: 17%">AAA</div>
-              <div class="contentRow" style="width: 17%">BBB</div>
-              <div class="contentRow" style="width: 17%">CCC</div>
-              <div class="contentRow" style="width: 32%">DDD</div>
-              <div class="contentRow" style="width: 17%">EEE</div>
+          </div>
+          <div v-else>
+            <div v-if="printDetails.accountRequestFundsDetailList && printDetails.accountRequestFundsDetailList.length > 0">
+              <div class="baseRow" style="display: flex">
+                <div class="contentRow" style="width: 25%">费用类型</div>
+                <div class="contentRow" style="width: 25%">关联合同</div>
+                <div class="contentRow" style="width: 25%">款项说明</div>
+                <div class="contentRow" style="width: 25%">请款金额</div>
+              </div>
+              <div v-for="item in printDetails.accountRequestFundsDetailList" :key="item.id">
+                <div class="baseRow" style="display: flex">
+                  <div class="contentRow" style="width: 25%">
+                    {{ dictDataEcho(item.costType, fundsCostType) }}
+                  </div>
+                  <div class="contentRow" style="width: 25%">
+                    {{ item.contractCode }}
+                  </div>
+                  <div class="contentRow" style="width: 25%">
+                    {{ item.remarks }}
+                  </div>
+                  <div class="contentRow" style="width: 25%">
+                    {{ item.amount }}
+                  </div>
+                </div>
+              </div>
             </div>
-            <div class="baseRow" style="display: flex">
-              <div class="contentRow" style="width: 80px">预支金额</div>
-              <div class="contentRow" style="width: calc(50% - 80px)">GGG</div>
-              <div class="contentRow" style="width: 80px">核销总额</div>
-              <div class="contentRow" style="width: calc(50% - 80px)">HHH</div>
+            <div v-else>
+              <div class="baseRow" style="display: flex">
+                <div class="contentRow" style="width: 25%">费用类型</div>
+                <div class="contentRow" style="width: 25%">关联合同</div>
+                <div class="contentRow" style="width: 25%">款项说明</div>
+                <div class="contentRow" style="width: 25%">请款金额</div>
+              </div>
+              <div class="baseRow" style="display: flex">
+                <div class="contentRow" style="width: 25%"></div>
+                <div class="contentRow" style="width: 25%"></div>
+                <div class="contentRow" style="width: 25%"></div>
+                <div class="contentRow" style="width: 25%"></div>
+              </div>
             </div>
             <div class="baseRow" style="display: flex">
-              <div class="contentRow" style="width: 80px">差额</div>
-              <div class="contentRow" style="width: calc(50% - 80px)">GGG</div>
+              <div class="contentRow" style="width: 80px">请款总额</div>
+              <div class="contentRow" style="width: calc(50% - 80px)">
+                {{ printDetails.total }}
+              </div>
               <div class="contentRow" style="width: 80px">单证数量</div>
-              <div class="contentRow" style="width: calc(50% - 80px)">HHH</div>
+              <div class="contentRow" style="width: calc(50% - 80px)">
+                {{ printDetails.quantity }}
+              </div>
             </div>
-          </div> -->
+          </div>
           <div class="specialRow">
             <span>付款明细</span>
           </div>
@@ -150,7 +182,7 @@
             </div>
             <div class="contentRow" style="width: 80px">付款账户</div>
             <div class="contentRow" style="width: calc(50% - 80px)">
-              {{ printDetails.accountManagementName }}
+              {{ dictValueLabel(printDetails.accountManagementId, accountData) }}
             </div>
           </div>
           <div class="baseRow" style="display: flex">
@@ -369,6 +401,7 @@ const openModal = () => {
 const userInfo = useUserStore().user;
 const tenantId = userInfo.tenantId;
 const fundsType = ref([]);
+const accountData = ref([]);
 const accountCurrency = ref([]);
 const fundsCostType = ref([]);
 const fundsPaymentMethod = ref([]);
@@ -420,6 +453,15 @@ const getDictData = () => {
     .then((res) => {
       fundsCostType.value = res.rows;
     });
+  proxy.post("/accountManagement/page", { pageNum: 1, pageSize: 9999 }).then((res) => {
+    accountData.value = res.rows.map((item) => {
+      return {
+        ...item,
+        label: item.alias,
+        value: item.id,
+      };
+    });
+  });
 };
 getDictData();
 getList();