Browse Source

财务管理日期范围选择修改,部分表单校验修改

lph 11 months ago
parent
commit
467c7d22f6

+ 3 - 4
zkqy-ui/.env.development

@@ -14,16 +14,15 @@ VUE_APP_BASE_IMG_API = 'http://192.168.110.15:1025/dev-api'
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
 
 #本项目地址
-VUE_APP_BASE_API1 = 'http://192.168.110.15:8066/'
+# VUE_APP_BASE_API1 = 'http://192.168.110.15:8066/'
 # VUE_APP_BASE_API1 = 'http://192.168.110.59:8066/'
-# VUE_APP_BASE_API1 = 'http://192.168.110.76:8066/'
+VUE_APP_BASE_API1 = 'http://192.168.110.76:8066/'
 
 # ws地址
 VUE_APP_BASE_WS_API = '//192.168.110.15:9000'
 
 #数据引擎模块IP
-#VUE_APP_BASE_API2 = 'http://192.168.110.
-59:8099/'
+#VUE_APP_BASE_API2 = 'http://192.168.110.59:8099/'
 
 #表单引擎模块IP
 #VUE_APP_BASE_API3 = 'http://192.168.110.59:8088/'

+ 1 - 0
zkqy-ui/src/views/system/financialManage/finishedProductInvoice.vue

@@ -18,6 +18,7 @@
         >
         </el-date-picker> -->
         <el-date-picker
+        :unlink-panels="true"
           v-model="timeRange"
           type="daterange"
           range-separator="至"

+ 4 - 3
zkqy-ui/src/views/system/financialManage/receiveRecord.vue

@@ -65,6 +65,7 @@
         >
         </el-date-picker> -->
         <el-date-picker
+          :unlink-panels="true"
           v-model="timeRange"
           type="daterange"
           range-separator="至"
@@ -553,9 +554,9 @@ export default {
         amounts: [
           { required: true, message: "收款金额不能为空", trigger: "blur" },
         ],
-        settlementUnitId: [
-          { required: true, message: "结算单位不能为空", trigger: "change" },
-        ],
+        // settlementUnitId: [
+        //   { required: true, message: "结算单位不能为空", trigger: "change" },
+        // ],
       },
     };
   },

+ 1 - 0
zkqy-ui/src/views/system/financialManage/receiveRecordReview.vue

@@ -65,6 +65,7 @@
         >
         </el-date-picker> -->
         <el-date-picker
+        :unlink-panels="true"
           v-model="timeRange"
           type="daterange"
           range-separator="至"

+ 1 - 0
zkqy-ui/src/views/system/financialManage/saleAccountsReceivableDetail.vue

@@ -41,6 +41,7 @@
         <el-col :span="10">
           <el-form-item label="日期范围" prop="startTime">
             <el-date-picker
+            :unlink-panels="true"
               v-model="timeRange"
               type="daterange"
               range-separator="至"

+ 1 - 0
zkqy-ui/src/views/system/financialManage/saleOtherCollection.vue

@@ -26,6 +26,7 @@
         >
         </el-date-picker> -->
         <el-date-picker
+        :unlink-panels="true"
           v-model="timeRange"
           type="daterange"
           range-separator="至"

+ 1 - 0
zkqy-ui/src/views/system/financialManage/saleOtherCollectionReview.vue

@@ -18,6 +18,7 @@
       </el-form-item> -->
       <el-form-item label="日期范围" prop="otherCollectionDate">
         <el-date-picker
+        :unlink-panels="true"
           v-model="timeRange"
           type="daterange"
           range-separator="至"

+ 1 - 0
zkqy-ui/src/views/system/financialManage/waitDetailsReview.vue

@@ -41,6 +41,7 @@
         <el-col :span="10">
           <el-form-item label="日期范围" prop="startTime">
             <el-date-picker
+              :unlink-panels="true"
               v-model="timeRange"
               type="daterange"
               range-separator="至"

+ 2 - 1
zkqy-ui/vue.config.js

@@ -40,7 +40,8 @@ module.exports = {
       [process.env.VUE_APP_BASE_API]: {
         // target: `http://192.168.110.52:8066`,
         // target: `http://192.168.110.59:8066`,
-        target: `http://192.168.110.15:8066/`,
+        // target: `http://192.168.110.15:8066/`,
+        target: `http://192.168.110.76:8066/`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''