소스 검색

维多利亚采购付款新需求

cz 1 년 전
부모
커밋
a81621614c
2개의 변경된 파일48개의 추가작업 그리고 7개의 파일을 삭제
  1. 21 2
      src/views/WDLY/outInBound/abnormal/index.vue
  2. 27 5
      src/views/WDLY/purchaseManage/payment/index.vue

+ 21 - 2
src/views/WDLY/outInBound/abnormal/index.vue

@@ -159,7 +159,7 @@ const statusData = [
     value: "2",
   },
 ];
-const selectConfig = reactive([
+const selectConfig = computed(() => [
   {
     label: "异常来源",
     prop: "type",
@@ -170,6 +170,11 @@ const selectConfig = reactive([
     prop: "status",
     data: statusData,
   },
+  {
+    label: "采购发起人",
+    prop: "purchaseUserId",
+    data: alreadyPurchase.value,
+  },
 ]);
 
 const config = computed(() => {
@@ -211,6 +216,13 @@ const config = computed(() => {
     },
     {
       attrs: {
+        label: "采购发起人",
+        prop: "purchaseUserName",
+        width: 120,
+      },
+    },
+    {
+      attrs: {
         label: "创建人",
         prop: "createUserName",
         width: 120,
@@ -358,7 +370,6 @@ const formConfigData = [
         { label: "跟进中", value: "0" },
       ],
     },
-
     {
       type: "select",
       prop: "handleUser",
@@ -498,11 +509,19 @@ const getDtl = (row) => {
     linkCode: row.linkCode,
     title: row.title,
     handleTime: proxy.parseTime(new Date()),
+    handleUser: useUserStore().user.userId,
   };
   dialogVisible.value = true;
 };
 const handleMethon = ref([]);
+const alreadyPurchase = ref([]);
 const getDict = () => {
+  proxy.get("/purchase/getPurchaseUserList").then((res) => {
+    alreadyPurchase.value = res.data.map((x) => ({
+      label: x.nickName,
+      value: x.userId,
+    }));
+  });
   proxy.getDictOne(["handle_methon"]).then((res) => {
     handleMethon.value = res["handle_methon"].map((x) => ({
       label: x.dictValue,

+ 27 - 5
src/views/WDLY/purchaseManage/payment/index.vue

@@ -129,10 +129,12 @@
             :key="index"
             :timestamp="activity.payUserName"
           >
-            <!-- <template default>
-              <div>aa</div>
-            </template> -->
-            <div>付款金额:{{ moneyFormat(activity.amount, 2) }}</div>
+            <div>
+              付款账号: {{ dictValueLabel(activity.payAccount, accountData) }}
+            </div>
+            <div style="margin-top: 5px">
+              付款金额:{{ moneyFormat(activity.amount, 2) }}
+            </div>
             <div style="margin-top: 5px">付款时间: {{ activity.payDate }}</div>
           </el-timeline-item>
         </el-timeline>
@@ -168,6 +170,9 @@ let modalType = ref("add");
 let rules = ref({
   amount: [{ required: true, message: "请输入付款金额", trigger: "blur" }],
   payDate: [{ required: true, message: "请选择付款时间", trigger: "change" }],
+  payAccount: [
+    { required: true, message: "请选择付款账号", trigger: "change" },
+  ],
 });
 const { proxy } = getCurrentInstance();
 const arrivalStatus = ref([
@@ -325,6 +330,14 @@ let formConfig = computed(() => [
     prop: "payDate",
     label: "付款时间",
     format: "YYYY-MM-DD HH:mm:ss",
+    itemWidth: 35,
+  },
+  {
+    type: "select",
+    prop: "payAccount",
+    label: "付款账号",
+    data: accountData.value,
+    itemWidth: 50,
   },
   {
     type: "number",
@@ -503,8 +516,17 @@ const handleClear = (row) => {
       });
   });
 };
-
+const accountData = ref([]);
+const getDict = () => {
+  proxy.getDictOne(["purchase_payment_account"]).then((res) => {
+    accountData.value = res["purchase_payment_account"].map((x) => ({
+      label: x.dictValue,
+      value: x.dictKey,
+    }));
+  });
+};
 getList();
+getDict();
 </script>
   
 <style lang="scss" scoped>