Merge branch 'master' of http://git.platomix.net/hml/zm

src/pages.json

@@ -95,6 +95,13 @@
       }
     },
     {
+      "path": "pages/procure/view",
+      "style": {
+        "navigationStyle": "default",
+        "navigationBarTitleText": "详情"
+      }
+    },
+    {
       "path": "pages/settlement/list",
       "style": {
         "navigationStyle": "default",
@@ -144,6 +151,13 @@
         "navigationStyle": "default",
         "navigationBarTitleText": "回款打款管理"
       }
+    },
+    {
+      "path": "pages/payment/view",
+      "style": {
+        "navigationStyle": "default",
+        "navigationBarTitleText": "详情"
+      }
     }
   ],
   "tabBar": {

src/pages/home/Home.vue

@@ -17,7 +17,7 @@
             <wd-cell title="采购管理" is-link icon="edit" to="/pages/procure/list" />
             <wd-cell title="结算管理" is-link icon="spool" to="/pages/settlement/list" />
             <wd-cell title="回款打款管理" is-link icon="spool" to="/pages/payment/list" />
-            <wd-cell title="油品信息管理" is-link icon="location" to="/pages/oils/list" />
+            <wd-cell title="项目-油品信息管理" is-link icon="location" to="/pages/oils/list" />
           </template>
         </wd-cell-group>
         <wd-cell title="退出当前账号" @click="doLogout" icon="translate-bold" is-link />

src/pages/payment/edit.vue

@@ -2,7 +2,7 @@
   <view class="edit">
     <wd-cell-group v-if="isEdit == '1'" custom-class="group" border>
       <wd-calendar
-        v-model="detail['收款日期']"
+        v-model="detail.COL_ALIAS_0.value"
         label="收款日期"
         @confirm="handleConfirm($event, 1)"
       />
@@ -10,31 +10,31 @@
         :columns="columns"
         label="项目名称"
         @confirm="project($event, 1)"
-        v-model="detail['项目名称']"
+        v-model="detail.COL_ALIAS_7.value"
       />
-      <wd-input type="number" label="金额" v-model="detail['金额']" />
-      <wd-picker :columns="payList" label="回款方式" v-model="detail['回款方式']" />
-      <wd-input type="number" label="贴息费" v-model="detail['贴息费']" />
-      <wd-input type="number" label="净额" v-model="detail['净额']" />
-      <wd-input type="number" label="余额" v-model="detail['余额']" />
-      <wd-input label="汇款单位名称" v-model="detail['汇款单位名称']" />
-      <wd-input label="汇款单位账号" v-model="detail['汇款单位账号']" />
+      <wd-input type="number" label="金额" v-model="detail.COL_ALIAS_12.value" />
+      <wd-picker :columns="payList" label="回款方式" v-model="detail.COL_ALIAS_1.value" />
+      <wd-input type="number" label="贴息费" v-model="detail.COL_ALIAS_7.value" />
+      <wd-input type="number" label="净额" v-model="detail.COL_ALIAS_14.value" />
+      <wd-input type="number" label="余额" v-model="detail.COL_ALIAS_15.value" />
+      <wd-input label="汇款单位名称" v-model="detail.COL_ALIAS_4.value" />
+      <wd-input label="汇款单位账号" v-model="detail.COL_ALIAS_5.value" />
       <wd-picker
         :columns="accounts"
         label="账户名称"
         @confirm="clickAccount($event, 1)"
-        v-model="detail['账户名称']"
+        v-model="detail.COL_ALIAS_2.value"
       />
-      <wd-input label="收款银行账号" readonly v-model="detail['银行账号']" />
+      <wd-input label="收款银行账号" readonly v-model="detail.COL_ALIAS_3.value" />
       <wd-cell title="汇款类型">
         <template #default>
-          <wd-radio-group v-model="detail['汇款类型']" shape="button">
+          <wd-radio-group v-model="detail.COL_ALIAS_8.value" shape="button">
             <wd-radio :value="'打款'">打款</wd-radio>
             <wd-radio :value="'回款'">回款</wd-radio>
           </wd-radio-group>
         </template>
       </wd-cell>
-      <wd-input label="财务姓名" v-model="detail['财务姓名']" />
+      <wd-input label="财务姓名" v-model="detail.COL_ALIAS_17.value" />
       <view class="btn">
         <wd-button block type="primary" @click="formSubmit">提交</wd-button>
       </view>
@@ -83,7 +83,6 @@ import dataService from '@/api/procure';
 import { useToast } from 'wot-design-uni';
 import { ref } from 'vue';
 import moment from 'moment';
-import { on } from 'events';
 const toast = useToast();
 const detail = ref({});
 const fields = ref({});
@@ -109,27 +108,25 @@ onLoad((options) => {
   formId.value = options.formId;
   if (options.isEdit == '1') {
     const item = JSON.parse(options.item);
-    const obj = {};
-    item.forEach((child) => {
-      obj[child.text] = child.value;
-    });
-    detail.value = obj;
+    detail.value = JSON.parse(options.item);
+    for (let key in item) {
+      oldValues.value[item[key].valueKey] = item[key].value;
+    }
     console.log(detail.value);
-    oldValues.value = JSON.parse(options.item);
   } else {
     fields.value = JSON.parse(options.fields);
   }
 
   projectList();
-  // getAccounts();
+  getAccounts();
 });
 
 // 选择项目
 function project(e, num) {
   if (num == 1) {
-    detail.value['项目编号'] = projectArr.value.find((child) => child['项目名称'] === e.value)[
-      '项目编号'
-    ];
+    detail.value.COL_ALIAS_7.value = projectArr.value.find(
+      (child) => child['项目名称'] === e.value
+    )['项目编号'];
   } else {
     fields.value[560] = projectArr.value.find((child) => child['项目名称'] === e.value)['项目编号'];
   }
@@ -139,7 +136,7 @@ function project(e, num) {
 // 选择账户
 function clickAccount(e, num) {
   if (num === 1) {
-    detail.value['银行账号'] = accountsList.value.find(
+    detail.value.COL_ALIAS_2.value = accountsList.value.find(
       (child) => child['付款单位名称'] === e.value
     )['银行账户'];
   } else {
@@ -153,10 +150,11 @@ function clickAccount(e, num) {
 function getAccounts() {
   let data = '';
   if (isEdit.value == '1') {
-    data = detail.value['项目编号'];
+    data = detail.value.COL_ALIAS_6.value;
   } else {
     data = fields.value[560];
   }
+  // console.log(data);
   dataService.getAccountList(data).then((res) => {
     if (res.code === 200) {
       accountsList.value = res.data;
@@ -210,41 +208,33 @@ function formAdd() {
 
 function handleConfirm(e, num) {
   if (num === 1) {
-    detail.value['收款日期'] = e.value;
-  } else if (num == 2) {
-    detail.value['付款日期'] = e.value;
+    detail.value.COL_ALIAS_0.value = e.value;
   } else {
     fields.value[554] = e.value;
   }
 }
 function formSubmit() {
-  const old = {};
-  const dataObj = {};
-  oldValues.value.forEach((child) => {
-    old[child.valueKey] = child.value;
-    for (const key in detail.value) {
-      if (child.text === key) {
-        dataObj[child.valueKey] = detail.value[key];
-      }
-    }
-  });
-
-  old['564'] = moment(old['564']).valueOf();
-  old['563'] = moment(old['563']).valueOf();
-  old['554'] = moment(old['554']).valueOf();
-  dataObj['554'] = moment(dataObj['554']).valueOf();
-  dataObj['563'] = moment(dataObj['563']).valueOf();
-  dataObj['564'] = moment(dataObj['564']).valueOf();
+  let dataObj = {};
+  detail.value.COL_ALIAS_0.value = moment(detail.value.COL_ALIAS_0.value).valueOf();
+  detail.value.COL_ALIAS_10.value = moment(new Date()).valueOf();
+  detail.value.COL_ALIAS_9.value = moment(new Date()).valueOf();
+  for (const key in detail.value) {
+    dataObj[detail.value[key].valueKey] =
+      detail.value[key].value != null ? detail.value[key].value : '';
+  }
+  oldValues.value[554] = moment(oldValues.value[554]).valueOf();
+  oldValues.value[563] = moment(oldValues.value[563]).valueOf();
+  oldValues.value[564] = moment(oldValues.value[564]).valueOf();
   const data = [
     {
       data: JSON.stringify(dataObj),
-      id: detail.value.idKey,
-      oldData: JSON.stringify(old),
+      id: detail.value.COL_ALIAS_11.value,
+      oldData: JSON.stringify(oldValues.value),
     },
   ];
   const params = {
     formKey: formId.value,
-    id: detail.value.idKey,
+    id: detail.value.COL_ALIAS_11.value,
     data: data,
   };
   dataService.editData(params).then((res) => {

src/pages/payment/list.vue

@@ -20,24 +20,43 @@
     </view>
     <view style="height: 70px"></view>
     <view v-if="listData.length > 0">
-      <wd-card v-for="(item, index) in oldData" :key="index">
-        <view v-for="(child, childIndex) in item" :key="childIndex">
-          <view class="flex">
-            <view class="left">{{ child.text }}:</view>
-            <view class="right">{{ child.value }}</view>
+      <wd-card
+        v-for="(item, index) in oldData"
+        :key="index"
+        :title="'付款日期:' + item.COL_ALIAS_0.value"
+      >
+        <view class="flex">
+          <view class="left">项目名称:</view>
+          <view class="right">
+            {{ item.COL_ALIAS_7.value }}
+          </view>
+        </view>
+        <view class="flex">
+          <view class="left">项目编号:</view>
+          <view class="right">
+            {{ item.COL_ALIAS_6.value }}
+          </view>
+        </view>
+        <view class="flex">
+          <view class="left">金额:</view>
+          <view class="right">
+            {{ item.COL_ALIAS_12.value }}
+          </view>
+        </view>
+        <view class="flex">
+          <view class="left">汇款单位名称:</view>
+          <view class="right">
+            {{ item.COL_ALIAS_4.value }}
           </view>
         </view>
         <template #footer>
-          <wd-button size="small" plain @click="editClick(item)">编辑</wd-button>
-          <wd-button
-            style="margin-left: 10px"
-            size="small"
-            type="error"
-            plain
-            @click="deleteItem(item)"
-          >
-            删除
-          </wd-button>
+          <wd-button size="small" type="warning" @click="detailClick(item)">查看详情</wd-button>
+          <span style="margin-left: 10px">
+            <wd-button size="small" type="primary" @click="editClick(item)">编辑</wd-button>
+          </span>
+          <span style="margin-left: 10px">
+            <wd-button size="small" type="error" @click="deleteItem(item)">删除</wd-button>
+          </span>
         </template>
       </wd-card>
       <wd-loadmore custom-class="loadmore" :state="loadState" />
@@ -123,6 +142,13 @@ onUnload(() => {
   uni.$off('refresh');
 });
 
+// 查看详情
+function detailClick(item) {
+  uni.navigateTo({
+    url: '/pages/payment/view?item=' + JSON.stringify(item),
+  });
+}
+
 onReachBottom(() => {
   if (isMore.value) {
     form.value.pageQuery.current++;
@@ -134,15 +160,15 @@ onReachBottom(() => {
 function deleteItem(item) {
   message
     .confirm({
-      msg: '提示文案',
-      title: '是否删除该条数据？',
+      msg: '是否删除该条数据？',
+      title: '提示',
     })
     .then(() => {
-      const id = item.find((val) => val.text === 'idKey').value;
+      const id = item.COL_ALIAS_11.value;
       const jsonData = {};
-      item.forEach((val) => {
-        jsonData[val.valueKey] = val.value;
-      });
+      for (let key in item) {
+        jsonData[item[key].valueKey] = item[key].value;
+      }
       const formKey = '9317b42e0d9a4a54706a5fcf9ab05158';
       let urlParams = `dataJson=${jsonData}`;
       uni.request({
@@ -158,9 +184,6 @@ function deleteItem(item) {
           onSearch();
         },
       });
-    })
-    .catch(() => {
-      console.log('点击了取消按钮');
     });
 }
 
@@ -260,26 +283,27 @@ function getFormList() {
       arr.push({
         filedCode: columnDict[idKey.value],
         fieldName: 'idKey',
-        valueKey: idKey.value,
+        valueKey: Number(idKey.value),
         fieldId: idKey.value,
       });
       listData.value = pageData.records.map((val) => {
-        const newObj = [];
+        const newObj = {};
         for (const k in val) {
           arr.forEach((v) => {
-            const obj = {};
+            let obj = {};
             if (v.filedCode == k) {
-              newObj.push({
+              obj = {
                 text: v.fieldName,
-                value: val[k],
+                value: val[k] != null && val[k] != undefined ? val[k] : '',
                 valueKey: v.fieldId,
-              });
-              // newObj[v.fieldName] = val[k];
+              };
+              newObj[k] = obj;
             }
           });
         }
         return newObj;
       });
+      console.log(listData.value);
       if (form.value.pageQuery.current > 1) {
         listData.value.forEach((item) => {
           oldData.value.push(item);

src/pages/payment/view.vue

@@ -0,0 +1,30 @@
+<template>
+  <view class="view">
+    <wd-cell-group border>
+      <wd-cell
+        v-for="(item, index) in detail"
+        :title="item.text"
+        :value="item.value"
+        :key="index"
+      ></wd-cell>
+    </wd-cell-group>
+  </view>
+</template>
+
+<script setup>
+import { onLoad } from '@dcloudio/uni-app';
+import { ref } from 'vue';
+const detail = ref([]);
+onLoad((options) => {
+  let item = JSON.parse(options.item);
+  for (let key in item) {
+    detail.value.push({ text: item[key].text, value: item[key].value });
+  }
+});
+</script>
+
+<style lang="scss" scoped>
+.view {
+  padding: 0 10px 30px 10px;
+}
+</style>

src/pages/procure/edit.vue

@@ -1,55 +1,46 @@
 <template>
   <view class="edit">
-    <wd-cell-group v-if="isEdit == '1'" custom-class="group" border>
-      <wd-input label="采购单名称" v-model="detail['采购单名称']" />
-      <wd-input label="采购单号" readonly v-model="detail['采购单号']" />
-      <!-- <wd-calendar
-        v-model="detail['提交日期']"
-        label="提交日期"
-        @confirm="handleConfirm($event, 1)"
-      /> -->
-      <wd-input type="number" label="采购单价（元）" v-model="detail['采购单价（元）']" />
-      <wd-input type="number" label="采购金额（元）" v-model="detail['采购金额（元）']" />
-      <wd-input label="采购人" v-model="detail['采购人']" />
-      <!-- <wd-input label="采购名称" v-model="detail['采购名称']" /> -->
-      <wd-input
-        :label="'采购数量（' + detail['单位吨或者升'] + '）'"
-        v-model="detail['采购数量（吨）']"
-      />
+    <wd-cell-group v-if="isEdit == '1'" custom-class="group" border :>
+      <wd-input label="采购单名称" v-model="detail.COL_ALIAS_1.value" />
+      <wd-input label="采购单号" readonly v-model="detail.COL_ALIAS_23.value" />
+      <wd-input type="number" label="采购单价（元）" required v-model="detail.COL_ALIAS_14.value" />
+      <wd-input type="number" label="采购金额（元）" v-model="detail.COL_ALIAS_15.value" />
+      <wd-input label="采购人" v-model="detail.COL_ALIAS_9.value" />
+      <wd-input :label="'采购数量'" required v-model="detail.COL_ALIAS_13.value" />
       <wd-picker
         :columns="columns"
         @confirm="projectClick($event, 1)"
         label="项目名称"
-        v-model="detail['项目名称']"
+        v-model="detail.COL_ALIAS_7.value"
       />
-      <wd-input label="项目编号" v-model="detail['项目编号']" />
+      <wd-input label="项目编号" readonly v-model="detail.COL_ALIAS_6.value" />
       <wd-picker
         :columns="oilList"
         label="油品名称"
         @confirm="oilClick($event, 1)"
-        v-model="detail['油品名称']"
+        v-model="detail.COL_ALIAS_2.value"
       />
-      <wd-picker :columns="oilInfo" label="型号" v-model="detail['型号']" />
-      <wd-cell title="单位吨或者升">
+      <wd-picker :columns="oilInfo" label="型号" v-model="detail.COL_ALIAS_3.value" />
+      <wd-cell title="单位吨或者升" required>
         <template #default>
-          <wd-radio-group v-model="detail['单位吨或者升']" shape="button">
+          <wd-radio-group v-model="detail.COL_ALIAS_22.value" shape="button">
             <wd-radio :value="'吨'">吨</wd-radio>
             <wd-radio :value="'升'">升</wd-radio>
           </wd-radio-group>
         </template>
       </wd-cell>
-      <wd-input label="市场价" v-model="detail['市场价']" />
-      <wd-input label="销售价格" v-model="detail['销售价格']" />
-      <wd-input label="折吨价" v-model="detail['折吨价']" />
-      <wd-input label="下浮价" v-model="detail['下浮价']" />
-      <wd-input label="价差" v-model="detail['价差']" />
-      <wd-picker :columns="payList" label="付款名称" v-model="detail['付款名称']" />
+      <wd-input label="市场价" v-model="detail.COL_ALIAS_16.value" />
+      <wd-input label="销售价格" v-model="detail.COL_ALIAS_19.value" />
+      <wd-input label="折吨价" v-model="detail.COL_ALIAS_17.value" />
+      <wd-input label="下浮价" v-model="detail.COL_ALIAS_18.value" />
+      <wd-input label="价差" v-model="detail.COL_ALIAS_20.value" />
+      <wd-picker :columns="payList" label="付款名称" v-model="detail.COL_ALIAS_5.value" />
       <wd-calendar
-        v-model="detail['付款日期']"
+        v-model="detail.COL_ALIAS_0.value"
         label="付款日期"
         @confirm="handleConfirm($event, 1)"
       />
-      <wd-picker :columns="collectionList" label="收款名称" v-model="detail['收款名称']" />
+      <wd-picker :columns="collectionList" label="收款名称" v-model="detail.COL_ALIAS_4.value" />
       <view class="btn">
         <wd-button block type="primary" @click="formSubmit">提交</wd-button>
       </view>
@@ -72,7 +63,7 @@
         v-model="fields[573]"
       />
       <wd-picker v-if="fields[573] != ''" :columns="oilInfo" label="型号" v-model="fields[574]" />
-      <wd-cell title="单位吨或者升">
+      <wd-cell title="单位吨或者升" required>
         <template #default>
           <wd-radio-group v-model="fields[864]" shape="button">
             <wd-radio :value="'吨'">吨</wd-radio>
@@ -81,8 +72,8 @@
         </template>
       </wd-cell>
       <wd-input :label="'采购数量:'" v-model="fields[584]" />
-      <wd-input type="number" label="采购单价（元）" v-model="fields[585]" />
-      <wd-input type="number" label="采购金额（元）" v-model="fields[586]" />
+      <wd-input required type="number" label="采购单价（元）" v-model="fields[585]" />
+      <wd-input required type="number" label="采购金额（元）" v-model="fields[586]" />
       <wd-input label="市场价" v-model="fields[587]" />
       <wd-input label="折吨价" v-model="fields[588]" />
       <wd-input label="下浮价" v-model="fields[589]" />
@@ -122,13 +113,10 @@ onLoad((options) => {
   formId.value = options.formId;
   if (options.isEdit == '1') {
     const item = JSON.parse(options.item);
-    const obj = {};
-    item.forEach((child) => {
-      obj[child.text] = child.value;
-    });
-    detail.value = obj;
-    oldValues.value = JSON.parse(options.item);
-    console.log(detail.value);
+    detail.value = JSON.parse(options.item);
+    for (let key in item) {
+      oldValues.value[item[key].valueKey] = item[key].value;
+    }
   } else {
     fields.value = JSON.parse(options.fields);
   }
@@ -142,7 +130,7 @@ onLoad((options) => {
 function getCollection() {
   let projectId = '';
   if (isEdit.value == '1') {
-    projectId = detail.value['项目编号'];
+    projectId = detail.value.COL_ALIAS_6.value;
   } else {
     projectId = fields.value[577];
   }
@@ -159,7 +147,7 @@ function getCollection() {
 function getPayment() {
   let projectId = '';
   if (isEdit.value == '1') {
-    projectId = detail.value['项目编号'];
+    projectId = detail.value.COL_ALIAS_6.value;
   } else {
     projectId = fields.value[577];
   }
@@ -175,15 +163,19 @@ function getPayment() {
 // 选择油品
 function oilClick(e, num) {
   if (num == 1) {
-    detail.value['油品名称'] = e.value;
+    detail.value.COL_ALIAS_2.value = e.value;
   } else {
     fields.value[573] = e.value;
-    getOilList();
   }
+  getOilList();
 }
 
 // 新增
 function formAdd() {
+  if (fields[584] == '' || fields[585] == '' || fields[864] == '') {
+    toast.error('请填写完整信息');
+    return;
+  }
   const date = new Date();
   fields.value[581] = moment(date).valueOf();
   fields.value[582] = moment(date).valueOf();
@@ -236,8 +228,8 @@ function formAdd() {
 function getOilList() {
   const params = {};
   if (isEdit.value == '1') {
-    params.projectid = detail.value['项目编号'];
-    params.ypmc = detail.value['油品名称'];
+    params.projectid = detail.value.COL_ALIAS_6.value;
+    params.ypmc = detail.value.COL_ALIAS_2.value;
   } else {
     params.projectid = fields.value[577];
     params.ypmc = fields.value[573];
@@ -254,10 +246,10 @@ function getOilList() {
 // 选择项目
 function projectClick(e, num) {
   if (num == 1) {
-    detail.value['项目名称'] = e.value;
-    detail.value['项目编号'] = projectArr.value.find((child) => child['项目名称'] === e.value)[
-      '项目编号'
-    ];
+    detail.value.COL_ALIAS_7.value = e.value;
+    detail.value.COL_ALIAS_6.value = projectArr.value.find(
+      (child) => child['项目名称'] === e.value
+    )['项目编号'];
     getOilList();
   } else {
     fields.value[578] = e.value;
@@ -281,44 +273,45 @@ function projectList() {
 
 function handleConfirm(e, num) {
   if (num === 1) {
-    detail.value['付款日期'] = e.value;
-    detail.value['提交日期'] = moment(new Date()).valueOf();
+    detail.value.COL_ALIAS_0.value = e.value;
   } else {
     fields.value[571] = e.value;
   }
 }
 function formSubmit() {
-  const date = new Date();
-  const old = {};
-  const dataObj = {};
-  oldValues.value.forEach((child) => {
-    old[child.valueKey] = child.value;
-    for (const key in detail.value) {
-      if (child.text === key) {
-        dataObj[child.valueKey] = detail.value[key];
-      }
-    }
-  });
-  dataObj['571'] = moment(dataObj['571']).valueOf();
-  old['571'] = moment(old['571']).valueOf();
-  dataObj['581'] = moment(dataObj['581']).valueOf();
-  old['581'] = moment(old['581']).valueOf();
-  dataObj['582'] = moment(date).valueOf();
-  old['582'] = moment(old['582']).valueOf();
+  if (
+    detail.value.COL_ALIAS_13.value == '' ||
+    detail.value.COL_ALIAS_14.value == '' ||
+    detail.value.COL_ALIAS_23.value == ''
+  ) {
+    toast.error('请填写完整信息');
+    return;
+  }
+  detail.value.COL_ALIAS_0.value = moment(detail.value.COL_ALIAS_0.value).valueOf();
+  detail.value.COL_ALIAS_10.value = moment(new Date()).valueOf();
+  detail.value.COL_ALIAS_11.value = moment(new Date()).valueOf();
+  let dataObj = {};
+  console.log(detail.value);
+  for (const key in detail.value) {
+    dataObj[detail.value[key].valueKey] =
+      detail.value[key].value != null ? detail.value[key].value : '';
+  }
+  oldValues.value[571] = moment(oldValues.value[571]).valueOf();
+  oldValues.value[581] = moment(oldValues.value[581]).valueOf();
+  oldValues.value[582] = moment(oldValues.value[582]).valueOf();
   const data = [
     {
       data: JSON.stringify(dataObj),
-      id: detail.value.idKey,
-      oldData: JSON.stringify(old),
+      id: detail.value.COL_ALIAS_12.value,
+      oldData: JSON.stringify(oldValues.value),
     },
   ];
   const params = {
     formKey: formId.value,
-    id: detail.value.idKey,
+    id: detail.value.COL_ALIAS_12.value,
     data: data,
   };
-
-  toast.success('操作成功');
+  console.log(params);
   dataService.editData(params).then((res) => {
     if (res.code === 200) {
       toast.success('更新成功');

src/pages/procure/list.vue

@@ -20,29 +20,43 @@
     </view>
     <view style="height: 70px"></view>
     <view v-if="listData.length > 0">
-      <wd-card v-for="(item, index) in oldData" :key="index">
-        <view v-for="(child, childIndex) in item" :key="childIndex">
-          <view
-            v-if="
-              child.text != '最后修改日期' && child.text != '创建人ID' && child.text != '提交日期'
-            "
-            class="flex"
-          >
-            <view class="left">{{ child.text }}:</view>
-            <view class="right">{{ child.value }}</view>
+      <wd-card
+        v-for="(item, index) in oldData"
+        :key="index"
+        :title="'付款日期:' + item.COL_ALIAS_0.value"
+      >
+        <view class="flex">
+          <view class="left">项目名称:</view>
+          <view class="right">
+            {{ item.COL_ALIAS_7.value }}
+          </view>
+        </view>
+        <view class="flex">
+          <view class="left">项目编号:</view>
+          <view class="right">
+            {{ item.COL_ALIAS_6.value }}
+          </view>
+        </view>
+        <view class="flex">
+          <view class="left">采购单号:</view>
+          <view class="right">
+            {{ item.COL_ALIAS_23.value }}
+          </view>
+        </view>
+        <view class="flex">
+          <view class="left">采购金额:</view>
+          <view class="right">
+            {{ item.COL_ALIAS_15.value }}
           </view>
         </view>
         <template #footer>
-          <wd-button size="small" plain @click="editClick(item)">编辑</wd-button>
-          <wd-button
-            style="margin-left: 10px"
-            size="small"
-            type="error"
-            plain
-            @click="deleteItem(item)"
-          >
-            删除
-          </wd-button>
+          <wd-button size="small" type="warning" @click="detailClick(item)">查看详情</wd-button>
+          <span style="margin-left: 10px">
+            <wd-button size="small" type="primary" @click="editClick(item)">编辑</wd-button>
+          </span>
+          <span style="margin-left: 10px">
+            <wd-button size="small" type="error" @click="deleteItem(item)">删除</wd-button>
+          </span>
         </template>
       </wd-card>
       <wd-loadmore custom-class="loadmore" :state="loadState" />
@@ -73,7 +87,6 @@ const message = useMessage();
 const toast = useToast();
 import dataService from '@/api/procure';
 import { ref, onMounted } from 'vue';
-import { on } from 'events';
 const value = ref('');
 const searchType = ref('采购单号');
 const loadState = ref('loading');
@@ -140,19 +153,26 @@ onReachBottom(() => {
   }
 });
 
+// 查看详情
+function detailClick(item) {
+  uni.navigateTo({
+    url: '/pages/procure/view?item=' + JSON.stringify(item),
+  });
+}
+
 // 删除
 function deleteItem(item) {
   message
     .confirm({
-      msg: '提示文案',
-      title: '是否删除该条数据？',
+      msg: '是否删除该条数据？',
+      title: '提示',
     })
     .then(() => {
-      const id = item.find((val) => val.text === 'idKey').value;
+      const id = item.COL_ALIAS_12.value;
       const jsonData = {};
-      item.forEach((val) => {
-        jsonData[val.valueKey] = val.value;
-      });
+      for (let key in item) {
+        jsonData[item[key].valueKey] = item[key].value;
+      }
       const formKey = 'f7436dcb6bbd469b1d154511ab74dd0f';
       let urlParams = `dataJson=${jsonData}`;
       uni.request({
@@ -168,9 +188,6 @@ function deleteItem(item) {
           onSearch();
         },
       });
-    })
-    .catch(() => {
-      console.log('点击了取消按钮');
     });
 }
 
@@ -269,20 +286,20 @@ function getFormList() {
         filedCode: columnDict[idKey.value],
         fieldName: 'idKey',
         valueKey: idKey.value,
-        fieldId: idKey.value,
+        fieldId: Number(idKey.value),
       });
       listData.value = pageData.records.map((val) => {
-        const newObj = [];
+        const newObj = {};
         for (const k in val) {
           arr.forEach((v) => {
-            const obj = {};
+            let obj = {};
             if (v.filedCode == k) {
-              newObj.push({
+              obj = {
                 text: v.fieldName,
-                value: val[k],
+                value: val[k] != null && val[k] != undefined ? val[k] : '',
                 valueKey: v.fieldId,
-              });
-              // newObj[v.fieldName] = val[k];
+              };
+              newObj[k] = obj;
             }
           });
         }
@@ -338,7 +355,6 @@ function onSelect({ item, rowIndex, colIndex }) {
 }
 // 关闭项目选项
 function close() {
-  searchType.value = '采购单号';
   sheetShow.value = false;
   oldData.value = [];
   form.value.pageQuery.current = 1;

src/pages/procure/view.vue

@@ -0,0 +1,30 @@
+<template>
+  <view class="view">
+    <wd-cell-group border>
+      <wd-cell
+        v-for="(item, index) in detail"
+        :title="item.text"
+        :value="item.value"
+        :key="index"
+      ></wd-cell>
+    </wd-cell-group>
+  </view>
+</template>
+
+<script setup>
+import { onLoad } from '@dcloudio/uni-app';
+import { ref } from 'vue';
+const detail = ref([]);
+onLoad((options) => {
+  let item = JSON.parse(options.item);
+  for (let key in item) {
+    detail.value.push({ text: item[key].text, value: item[key].value });
+  }
+});
+</script>
+
+<style lang="scss" scoped>
+.view {
+  padding: 0 10px 30px 10px;
+}
+</style>