瀏覽代碼

流程页面代码调整

lxf 1 年之前
父節點
當前提交
dee4854048

+ 2 - 1
src/components/process/Contract.vue

@@ -1248,7 +1248,7 @@ watch(
   props.queryData,
   () => {
     formOption.disabled = judgeStatus();
-    if (props.queryData && (route.query.processType == 10 || route.query.processType == 20)) {
+    if (props.queryData && ["10", "20", "30"].includes(route.query.processType)) {
       for (var text in props.queryData) {
         formData.data[text] = props.queryData[text];
       }
@@ -1258,6 +1258,7 @@ watch(
       if (formData.data.provinceId) {
         getCityData(formData.data.provinceId, "30");
       }
+      getDecisionAids();
     }
   },
   {

+ 1 - 1
src/components/process/EHSD/Contract.vue

@@ -1115,7 +1115,7 @@ watch(
   props.queryData,
   () => {
     formOption.disabled = judgeStatus();
-    if (props.queryData && (route.query.processType == 10 || route.query.processType == 20)) {
+    if (props.queryData && ["10", "20", "30"].includes(route.query.processType)) {
       for (var text in props.queryData) {
         if (text === "fileList" || text === "packageFileList") {
           if (props.queryData[text] && props.queryData[text].length > 0) {

+ 1 - 1
src/components/process/EHSD/PriceSheet.vue

@@ -855,7 +855,7 @@ watch(
   props.queryData,
   () => {
     formOption.disabled = judgeStatus();
-    if (props.queryData && (route.query.processType == 10 || route.query.processType == 20)) {
+    if (props.queryData && ["10", "20", "30"].includes(route.query.processType)) {
       for (var text in props.queryData) {
         formData.data[text] = props.queryData[text];
       }

+ 1 - 1
src/components/process/EHSD/Purchase.vue

@@ -941,7 +941,7 @@ watch(
   props.queryData,
   () => {
     formOption.disabled = judgeStatus();
-    if (props.queryData && (route.query.processType == 10 || route.query.processType == 20)) {
+    if (props.queryData && ["10", "20", "30"].includes(route.query.processType)) {
       for (var text in props.queryData) {
         formData.data[text] = props.queryData[text];
       }

+ 1 - 1
src/components/process/EHSD/Sample.vue

@@ -1055,7 +1055,7 @@ watch(
   props.queryData,
   () => {
     formOption.disabled = judgeStatus();
-    if (props.queryData && (route.query.processType == 10 || route.query.processType == 20)) {
+    if (props.queryData && ["10", "20", "30"].includes(route.query.processType)) {
       for (var text in props.queryData) {
         if (text === "fileList" || text === "packageFileList") {
           if (props.queryData[text] && props.queryData[text].length > 0) {

+ 1 - 1
src/components/process/PriceSheet.vue

@@ -809,7 +809,7 @@ watch(
   props.queryData,
   () => {
     formOption.disabled = judgeStatus();
-    if (props.queryData && (route.query.processType == 10 || route.query.processType == 20)) {
+    if (props.queryData && ["10", "20", "30"].includes(route.query.processType)) {
       for (var text in props.queryData) {
         formData.data[text] = props.queryData[text];
       }

+ 1 - 1
src/components/process/PurchasePayment.vue

@@ -424,7 +424,7 @@ watch(
   props.queryData,
   () => {
     formOption.disabled = judgeStatus();
-    if (props.queryData && (route.query.processType == 10 || route.query.processType == 20)) {
+    if (props.queryData && ["10", "20", "30"].includes(route.query.processType)) {
       for (var text in props.queryData) {
         formData.data[text] = props.queryData[text];
       }

+ 1 - 1
src/components/process/PurchaseRefund.vue

@@ -271,7 +271,7 @@ watch(
   props.queryData,
   () => {
     formOption.disabled = judgeStatus();
-    if (props.queryData && (route.query.processType == 10 || route.query.processType == 20)) {
+    if (props.queryData && ["10", "20", "30"].includes(route.query.processType)) {
       for (var text in props.queryData) {
         formData.data[text] = props.queryData[text];
       }

+ 1 - 1
src/components/process/ReturnGood.vue

@@ -216,7 +216,7 @@ watch(
   props.queryData,
   () => {
     formOption.disabled = judgeStatus();
-    if (props.queryData && (route.query.processType == 10 || route.query.processType == 20)) {
+    if (props.queryData && ["10", "20", "30"].includes(route.query.processType)) {
       for (const key in props.queryData) {
         formData.data[key] = props.queryData[key];
       }

+ 1 - 1
src/components/process/SendFunds.vue

@@ -493,7 +493,7 @@ const tenantId = userInfo.tenantId;
 watch(
   props.queryData,
   () => {
-    if (props.queryData && (route.query.processType == 10 || route.query.processType == 20)) {
+    if (props.queryData && ["10", "20", "30"].includes(route.query.processType)) {
       for (var text in props.queryData) {
         formData.data[text] = props.queryData[text];
       }

+ 1 - 1
src/components/process/SendSubscribe.vue

@@ -192,7 +192,7 @@ const judgeStatus = () => {
 watch(
   props.queryData,
   () => {
-    if (props.queryData && (route.query.processType == 10 || route.query.processType == 20)) {
+    if (props.queryData && ["10", "20", "30"].includes(route.query.processType)) {
       for (const key in props.queryData) {
         formData.data[key] = props.queryData[key];
       }

+ 1 - 1
src/components/process/ServiceContract.vue

@@ -912,7 +912,7 @@ watch(
   props.queryData,
   () => {
     formOption.disabled = judgeStatus();
-    if (props.queryData && (route.query.processType == 10 || route.query.processType == 20)) {
+    if (props.queryData && ["10", "20", "30"].includes(route.query.processType)) {
       for (var text in props.queryData) {
         formData.data[text] = props.queryData[text];
       }

+ 2 - 9
src/views/process/processApproval/index.vue

@@ -46,7 +46,7 @@
       </div>
     </div>
     <div class="right-card">
-      <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
+      <el-tabs v-model="activeName" class="demo-tabs">
         <el-tab-pane label="审批记录" name="first">
           <ul class="flow-chart">
             <li
@@ -156,9 +156,6 @@ const router = useRouter();
 const route = useRoute();
 // tab切换逻辑
 const activeName = ref("first");
-const handleClick = (tab, event) => {
-  // console.log(tab, event);
-};
 let auxiliaryData = ref([]);
 const getAuxiliaryData = (data)=>{
   auxiliaryData.value=data
@@ -387,7 +384,6 @@ const skipPage = () => {
     });
   } else {
     const useTagsStore = useTagsViewStore();
-    console.log(useTagsStore);
     useTagsStore.delVisitedView(router.currentRoute.value);
     ElMessage({
       message: "操作成功!",
@@ -475,7 +471,6 @@ const getRecords = (_id) => {
         id: _id,
       })
       .then((res) => {
-        console.log(res, "ass");
         recordList.value = res.recordList;
         queryData.data.recordList = res.recordList;
         approvalRecordData.value = res;
@@ -486,15 +481,13 @@ const getRecords = (_id) => {
         flowKey: flowForm.flowKey,
       })
       .then((res) => {
-        console.log(res, "ass");
         recordList.value = res;
       });
   }
-  console.log(queryData.data, "222");
 };
 onMounted(async () => {
   //processType 10 为修改 20为查看 30回退发起
-  if (route.query.processType == 10 || route.query.processType == 20) {
+  if (route.query.processType == 10 || route.query.processType == 20 || route.query.processType == 30) {
     await proxy.post("/flowProcess/getStartData", { flowId: route.query.id }).then((res) => {
       queryData.data = { ...res };
     });