Merge branch 'stage' into dev0.3

src/components/process/Contract.vue

@@ -14,14 +14,12 @@
                 <el-input v-model="formData.data.sellCountryName" placeholder="请输入国家" />
               </el-form-item>
             </el-col>
-            <el-col :span="1"></el-col>
-            <el-col :span="7">
+            <el-col :span="8">
               <el-form-item label=" " prop="sellProvinceName">
                 <el-input v-model="formData.data.sellProvinceName" placeholder="请输入省/州" />
               </el-form-item>
             </el-col>
-            <el-col :span="1"></el-col>
-            <el-col :span="7">
+            <el-col :span="8">
               <el-form-item label=" " prop="sellCityName">
                 <el-input v-model="formData.data.sellCityName" placeholder="请输入城市" />
               </el-form-item>
@@ -40,8 +38,7 @@
                 <el-input v-model="formData.data.sellContactName" placeholder="请输入联系人" />
               </el-form-item>
             </el-col>
-            <el-col :span="1"></el-col>
-            <el-col :span="15">
+            <el-col :span="16">
               <el-form-item label=" " prop="sellContactNumber">
                 <el-input v-model="formData.data.sellContactNumber" placeholder="请输入联系人电话" />
               </el-form-item>
@@ -66,8 +63,7 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col :span="1"></el-col>
-              <el-col :span="5">
+              <el-col :span="6">
                 <el-form-item label=" " prop="provinceName">
                   <selectCity
                     placeholder="省/洲"
@@ -79,14 +75,12 @@
                   </selectCity>
                 </el-form-item>
               </el-col>
-              <el-col :span="1"></el-col>
-              <el-col :span="5">
+              <el-col :span="6">
                 <el-form-item label=" " prop="cityName">
                   <selectCity placeholder="城市" addressId="cityId" addressName="cityName" v-model="formData.data" :data="cityData"> </selectCity>
                 </el-form-item>
               </el-col>
-              <el-col :span="1"></el-col>
-              <el-col :span="5">
+              <el-col :span="6">
                 <el-form-item label=" " prop="buyPostalCode">
                   <el-input v-model="formData.data.buyPostalCode" placeholder="请输入邮编" />
                 </el-form-item>
@@ -112,8 +106,7 @@
                   </el-autocomplete>
                 </el-form-item>
               </el-col>
-              <el-col :span="1"></el-col>
-              <el-col :span="15">
+              <el-col :span="16">
                 <el-form-item label=" " prop="buyContactNumber">
                   <el-input v-model="formData.data.buyContactNumber" placeholder="请输入联系人电话" />
                 </el-form-item>
@@ -265,14 +258,13 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="1"></el-col>
-            <el-col :span="5">
+            <el-col :span="6">
               <el-form-item label="合同总金额" prop="amount">
                 <el-input v-model="formData.data.amount" placeholder="合同总金额" disabled />
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row style="margin-top: 20px; width: 100%" :gutter="20">
+          <el-row style="margin-top: 20px; width: 100%">
             <el-col :span="7">
               <el-form-item label="付款方式" prop="paymentMethod">
                 <el-select v-model="formData.data.paymentMethod" placeholder="请选择付款方式" style="width: 100%">
@@ -356,7 +348,7 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row style="margin-top: 20px; width: 100%" :gutter="20">
+          <el-row style="margin-top: 20px; width: 100%">
             <el-col :span="7">
               <el-form-item label="运输方式" prop="transportMethod">
                 <el-select v-model="formData.data.transportMethod" placeholder="请选择运输方式" style="width: 100%">
@@ -370,14 +362,14 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row style="margin-top: 20px; width: 100%" :gutter="20">
+          <el-row style="margin-top: 20px; width: 100%">
             <el-col :span="14">
               <el-form-item label="付款条件" prop="remark">
                 <el-input v-model="formData.data.remark" :rows="2" type="textarea" placeholder="请输入付款条件" />
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row style="margin-top: 20px; width: 100%" :gutter="20">
+          <el-row style="margin-top: 20px; width: 100%">
             <el-col :span="7">
               <el-form-item label="交货期限 (天)" prop="deliveryTime">
                 <el-input-number
@@ -1259,7 +1251,6 @@ const changeShroffAccount = (val) => {
     }
   }
 };
-
 watch(
   props.queryData,
   () => {
@@ -1371,7 +1362,7 @@ onMounted(() => {
       }
     });
   }
-  if(route.query&&route.query.businessId){
+if(route.query&&route.query.businessId){
     proxy.post("/contract/detail", { id: route.query.businessId }).then((res) => {
       setTimeout(()=>{
         formData.data.id = res.id

src/views/finance/fundManage/depExpenses/index.vue

@@ -222,7 +222,6 @@ const config = computed(() => {
             el: "button",
             click() {
               depModal.value = true;
-              runningWaterId = row.id;
               dtlData.value = row;
               departmentId.value = [];
             },
@@ -279,7 +278,7 @@ const submitDeptForm = async (departmentId) => {
     ElMessage.error("请选择部门");
     return;
   }
-  const params = {
+  let params = {
     deptId: departmentId[departmentId.length - 1],
     accountDeptRunningWaterId: dtlData.value.accountDeptRunningWaterId,
     id: dtlData.value.id,
@@ -401,7 +400,7 @@ const submitForm = async () => {
       return ElMessage("分拆总金额需等于交易金额");
     }
     submitLoading.value = true;
-    const params = {
+    let params = {
       id: formData.data.id,
       deptRunningWaterDetailList: formData.data.accountDeptRunningWaterDetailList,
       accountDeptRunningWaterId: formData.data.accountDeptRunningWaterId,

src/views/index.vue

@@ -96,7 +96,8 @@
 	</div>
 </template>
 
-<script setup name="Index">
+<script setup >
+// name="Index" 增加缓存
 import { createApp, onMounted, ref } from 'vue'
 import byTableDemo from '../components/byTable/demo'
 import html2canvas from 'html2canvas'

src/views/process/dealWith/index.vue

@@ -51,7 +51,7 @@
 	</div>
 </template>
     
-  <script setup name="DealWith">
+  <script setup >
 /* eslint-disable vue/no-unused-components */
 import { ElMessage, ElMessageBox } from 'element-plus'
 import byTable from '@/components/byTable/index'
@@ -66,7 +66,7 @@ const sourceList = ref({
 		total: 3,
 		pageNum: 1,
 		pageSize: 10,
-        status:2,
+        status:1,
 	},
 })
 let dialogVisible = ref(false)
@@ -91,7 +91,10 @@ const selectConfig = computed(() => {
 			label: '流程状态',
 			prop: 'status',
 			data: [
-				
+				{
+					label: '待处理',
+					value: '1',
+				},
 				{
 					label: '已发起',
 					value: '2',
@@ -185,7 +188,7 @@ const config = computed(() => {
 											flowKey: row.flowKey,
 											id: row.id,
 											processType:nodeType == 1 ? 30 : 10,
-												businessId: row.businessId,
+											businessId:row.businessId,
 											version:row.version
 										},
 									});
@@ -269,7 +272,7 @@ const getList = async (req) => {
 	sourceList.value.pagination = { ...sourceList.value.pagination, ...req }
 	loading.value = true
 	proxy
-		.post( getUrlObj[sourceList.value.pagination.status] || '/flowExample/getHaveInitiatedPage', sourceList.value.pagination)
+		.post( getUrlObj[sourceList.value.pagination.status], sourceList.value.pagination)
 		.then((message) => {
 			console.log(message)
 			sourceList.value.data = message.rows