Merge branch 'ldx' into dev

src/pages/workbench/fwzc_fwcs.vue

@@ -80,7 +80,13 @@
             （用于查询流程状态）
           </p>
         </div>
-        <div v-show="(activeBtn == 4 && zhyyVal == 24) || activeBtn == 3">
+        <div
+          v-show="
+            (activeBtn == 4 && zhyyVal == 24) ||
+            activeBtn == 3 ||
+            activeBtn == 2
+          "
+        >
           <div class="fwcs_fwdz">
             上传接口文档
             <span class="title_bc">（请上传所有服务地址完整接口文档）</span>：
@@ -147,7 +153,7 @@
             服务测试
           </el-button>
         </div>
-        <div v-if="activeBtn == 0 || activeBtn == 3">
+        <div v-if="activeBtn == 0 || activeBtn == 2 || activeBtn == 3">
           <el-tabs v-model="activeName" class="fwcs_tabs" @tab-click="clickTab">
             <el-tab-pane label="请求参数" name="0">
               <ces-table
@@ -370,7 +376,10 @@
         </div>
         <div
           v-show="
-            (activeBtn == 1 || (activeBtn == 4 && zhyyVal == 34)) && resSuccess
+            (activeBtn == 1 ||
+              activeBtn == 2 ||
+              (activeBtn == 4 && zhyyVal == 34)) &&
+            resSuccess
           "
         >
           <div class="skfw_csfwxx">测试服务信息：</div>
@@ -387,6 +396,7 @@
           v-show="
             (activeBtn == 0 ||
               activeBtn == 1 ||
+              activeBtn == 2 ||
               activeBtn == 3 ||
               activeBtn == 4) &&
             !resSuccess
@@ -804,8 +814,8 @@ export default {
         { label: "DELETE", value: "DELETE" },
       ],
       optionType1: [{ label: "GET", value: "GET" }],
-      activeName: 0,
-      activeZh: 0,
+      activeName: "0",
+      activeZh: "0",
       sjfwQqcs: [
         {
           label: "请求字段编码",
@@ -1132,7 +1142,7 @@ export default {
         bodys = this.$refs.jsonCodes ? this.$refs.jsonCodes.getCodesVal() : "";
         contentType = this.sjfwQqt;
       } else if (this.activeBtn == 4) {
-        if (this.activeZh == 1) {
+        if (this.activeZh == "1") {
           contentType = this.zhfwQqt;
           if (this.zhfwQqt == "JSON") {
             bodys = this.$refs.zhfwJsonCodes
@@ -1204,10 +1214,12 @@ export default {
     nextJcxx() {
       if (
         this.activeBtn == 0 ||
+        this.activeBtn == 2 ||
         this.activeBtn == 3 ||
         (this.activeBtn == 4 && (this.zhyyVal == 22 || this.zhyyVal == 23))
       ) {
         if (
+          this.activeBtn == 2 ||
           this.activeBtn == 3 ||
           (this.activeBtn == 4 && this.zhyyVal == 22)
         ) {
@@ -1231,6 +1243,23 @@ export default {
               this.$message.error("请完善返回参数信息中的字段名称");
             }
           }
+        } else {
+          let requestData = this.$refs.fwcs_sjfw_qqcs.getTableData();
+          let responseData = this.$refs.fwcs_sjfw_fhcs.getTableData();
+          this.requestRules = 0;
+          this.responseRules = 0;
+          this.checkTable(requestData, 0);
+          this.checkTable(responseData, 1);
+          if (this.requestRules == 0 && this.responseRules == 0) {
+            this.request_fields = requestData;
+            this.response_fields = responseData;
+            this.jcxxtx = true;
+            this.getOrganization();
+          } else if (this.requestRules != 0) {
+            this.$message.error("请完善请求参数信息中的字段名称");
+          } else if (this.responseRules != 0) {
+            this.$message.error("请完善返回参数信息中的字段名称");
+          }
         }
       } else if (this.activeBtn == 1) {
         let value = helper.getQueryString("id", this.serviceUrl);
@@ -1410,7 +1439,7 @@ export default {
                 if (this.activeBtn == 0 || this.activeBtn == 3) {
                   contentType = this.sjfwQqt;
                 } else if (this.activeBtn == 4) {
-                  if (this.activeZh == 1) {
+                  if (this.activeZh == "1") {
                     contentType = this.zhfwQqt;
                   }
                 }