1
0

2 Revīzijas b83b41e7c9 ... 575d705f73

Autors SHA1 Ziņojums Datums
  YLZH 575d705f73 Merge branch 'master' of http://git.platomix.net/hml/zm 1 gadu atpakaļ
  YLZH 4bb28c669e 2)项目-油品信息里的密度 需要输入小数点,这个调起来数字键盘没有小数点。实际需要录入的效果是:0.8301 四位的小数位 1 gadu atpakaļ

+ 16 - 7
src/pages/oils/form.vue

@@ -18,7 +18,6 @@
           :label="'项目编号'"
           :prop="'396'"
           :placeholder="'请输入项目编号'"
-          type="number"
           :disabled="true"
         />
         <!-- 省 398-->
@@ -66,7 +65,7 @@
           :label="'合同定油品密度'"
           :prop="'405'"
           :placeholder="'请输入合同定油品密度'"
-          type="number"
+          type="digit"
         />
         <!-- 送油单价 406 -->
         <wd-input
@@ -74,7 +73,7 @@
           :label="'送油单价'"
           :prop="'406'"
           :placeholder="'请输入送油单价'"
-          type="number"
+          type="digit"
         />
       </wd-cell-group>
       <view class="footer">
@@ -110,8 +109,11 @@ const rules = ref({
   400: [{ required: true, message: '油品名称未填写' }],
   // 油品型号必填
   401: [{ required: true, message: '油品型号未填写' }],
-  406: [
-    { pattern: /^\d+(\.\d+)?$/, message: '请输入数字',trigger: 'blur' },
+  406: [{ pattern: /^\d+(\.\d+)?$/, message: '请输入数字', trigger: 'blur' }],
+  // 密度必填
+  405: [
+    { required: true, message: '密度未填写' },
+    { pattern: /^\d+(\.\d+)?$/, message: '请输入数字', trigger: 'blur' },
   ],
 });
 function init() {
@@ -226,17 +228,25 @@ function projectNameChange({ value }) {
 
 const form = ref();
 const oldFormData = ref('');
+console.log('11')
 function handleSubmit() {
   form.value
     .validate()
     .then(({ valid, errors }) => {
       if (valid) {
+        let paramsData = {}
+        // 过滤所有空值 为空字符 或者 null 或者 空数组
+        Object.keys(dataForm.value).map((key) => {
+          if (dataForm.value[key] !== '' && dataForm.value[key] !== null) {
+            paramsData[key] = dataForm.value[key];
+          }
+        });
         const params = {
           id: id.value ? '/' + id.value : '',
           formKey: formKey.value,
           data: [
             {
-              data: JSON.stringify(dataForm.value),
+              data: JSON.stringify(paramsData),
               id: id.value ? id.value : '',
               oldData: id.value ? oldFormData.value : null,
             },
@@ -246,7 +256,6 @@ function handleSubmit() {
         if (id.value) {
           DemoApi.getEditData(params).then((res) => {
             toast.close();
-
             if (res.code === 200) {
               // 如果res.data是数组则提示新增成功
               setTimeout(() => {

+ 6 - 2
src/pages/oils/list.vue

@@ -29,7 +29,7 @@
 
     <template v-for="(item, index) in settlementList" :key="index">
       <wd-card :title="'项目编号:' + item.COL_0.value">
-        <view class="project-body" @click="goDetail(item)">
+        <view class="project-body"  @click="goDetail(item)">
           <view class="body-list" v-for="(field, i) in showListField" :key="i">
             <view>{{ field.content }}: {{ item[field.field].value }}</view>
           </view>
@@ -52,6 +52,7 @@
 <script setup lang="ts">
 import DemoApi from '@/api/DemoApi';
 import router from '@/router';
+import config from '@/http/config';
 import { ref } from 'vue';
 import { useToast, useMessage } from 'wot-design-uni';
 const message = useMessage();
@@ -66,7 +67,6 @@ const menu = ref([
   },
 ]);
 const showListField = ref([
-  // 项目编号:
 
   {
     content: '项目名称',
@@ -99,6 +99,8 @@ function changeSearchType({ item, index }) {
   }
 }
 function searchFocus() {
+
+  uni.hideKeyboard()
   showSheet.value = true;
 }
 function searchChange(value) {
@@ -180,6 +182,7 @@ onPullDownRefresh(() => {
 });
 // 上拉加载
 onReachBottom(() => {
+  console.log('上拉加载');
   if (pageQuery.value.current * pageQuery.value.size < pageQuery.value.total) {
     pageQuery.value.current++;
     getSettlementList();
@@ -287,6 +290,7 @@ function goDetail(item) {
   router.push({
     path: 'pages/oils/detail',
     query: { filedsData: JSON.stringify(item || '[]'), formKey: formKey.value },
+
   });
 }
 // 删除

+ 12 - 6
src/pages/settlement/form.vue

@@ -73,7 +73,7 @@
           :label="'密度'"
           :prop="'549'"
           :placeholder="'请输入密度'"
-          type="number"
+          type="digit"
           :disabled="true"
         />
         <!-- 吨 550  -->
@@ -82,7 +82,7 @@
           :label="'吨'"
           :prop="'550'"
           :placeholder="'请输入吨'"
-          type="number"
+          type="digit"
           :disabled="true"
         />
         <!-- 单价 551 -->
@@ -91,7 +91,7 @@
           :label="'单价'"
           :prop="'551'"
           :placeholder="'请输入单价'"
-          type="number"
+          type="digit"
           :disabled="true"
         />
         <!-- 金额 552 -->
@@ -100,7 +100,7 @@
           :label="'金额'"
           :prop="'552'"
           :placeholder="'请输入金额'"
-          type="number"
+          type="digit"
         />
         <wd-cell :title="'发票上传'" title-width="150rpx" :prop="'544'">
           <wd-upload
@@ -440,13 +440,19 @@ function handleSubmit() {
             url: item.fileld,
           };
         });
-
+        let paramsData = {}
+        // 过滤所有空值 为空字符 或者 null 或者 空数组
+        Object.keys(dataForm.value).map((key) => {
+          if (dataForm.value[key] !== '' && dataForm.value[key] !== null && dataForm.value[key].length !== 0) {
+            paramsData[key] = dataForm.value[key];
+          }
+        });
         const params = {
           id: id.value ? '/' + id.value : '',
           formKey: formKey.value,
           data: [
             {
-              data: JSON.stringify(dataForm.value),
+              data: JSON.stringify(paramsData),
               id: id.value ? id.value : '',
               oldData: id.value ? oldFormData.value : null,
             },

+ 5 - 0
src/pages/settlement/list.vue

@@ -7,6 +7,7 @@
         @change="searchChange"
         @cancel="cancelChange"
         @focus="searchFocus"
+        :disabled="searchDisabled"
       >
         <template #prefix>
           <wd-popover v-model="show" mode="menu" :content="menu" @menuclick="changeSearchType">
@@ -62,6 +63,7 @@ const loadState = ref('loading');
 
 const searchType = ref<string>('项目名称');
 const value = ref<string>('');
+const searchDisabled = ref<boolean>(false);
 const menu = ref([
   {
     content: '项目名称',
@@ -110,6 +112,9 @@ function changeSearchType({ item, index }) {
   }
 }
 function searchFocus() {
+
+
+  uni.hideKeyboard();
   showSheet.value = true;
 }
 function searchChange(value) {