Merge branch 'dev_xzeq_xz' of http://39.99.224.27:9022/changchao/founder_vue into dev_xzeq_xz

src/components/ptCxForm_components.vue

@@ -463,6 +463,14 @@
             查询
           </div>
           <div
+            v-if="pageASs == 'bxqd'"
+            @click="doFqrwCount"
+            style="background: #ff6700; color: #ffffff"
+            class="zdybtn"
+          >
+            发起任务
+          </div>
+          <div
             @click="$emit('yjbtn')"
             style="background: #007aff; color: #ffffff"
             class="zdybtn"
@@ -744,7 +752,9 @@
                   pageBs != 'queryZtryJkm' &&
                   pageBs != 'queryRyypNew' &&
                   pageBs != 'transactionFlow' &&
+                  pageBs != 'xsbk1' &&
                   pageBs != 'queryZdcs' &&
+                  pageBs != 'queryQypz' &&
                   pageBs != 'queryBsh'
                 "
               >
@@ -2161,6 +2171,7 @@
                   pageBs == 'queryRyypNew' ||
                   pageBs == 'queryZtryJkm' ||
                   pageBs == 'queryZdcs' ||
+                  pageBs == 'xsbk1' ||
                   pageBs == 'transactionFlow'
                 )
               "
@@ -2390,6 +2401,7 @@
                 pageBs != 'queryRyypNew' &&
                 pageBs != 'queryJqcc' &&
                 pageBs != 'queryZdcs' &&
+                pageBs != 'xsbk1' &&
                 pageBs != 'queryZjcl'
               "
               >删除</span
@@ -3694,15 +3706,20 @@ export default {
       imgRaw: {},
       //选中当前行
       selectData: [],
-      timeString:''
+      timeString: "",
     };
   },
   methods: {
-    changeTimeArr(item){
-      debugger
-      if(new Date(this.formData[item.id]).getTime() > new Date(this.formData[item.id2]).getTime()){
-        this.$set(this.formData,item.id2,'')
-        this.$message.error('开始时间不能大于结束时间')
+    doFqrwCount() {
+      this.$emit("doFqrwCount");
+    },
+    changeTimeArr(item) {
+      if (
+        new Date(this.formData[item.id]).getTime() >
+        new Date(this.formData[item.id2]).getTime()
+      ) {
+        this.$set(this.formData, item.id2, "");
+        this.$message.error("开始时间不能大于结束时间");
       }
     },
     treeLoad(tree, treeNode, resolve) {