Merge branch 'settle-test-20230110' of http://114.115.138.98:8900/fukai/vue-gjjs…

Merge branch 'settle-test-20230110' of http://114.115.138.98:8900/fukai/vue-gjjs into settle-test-20230110

src/service/test/atp.js

@@ -13,7 +13,7 @@ export function add(data) {
 }
 
 export function hasCod(cod) {
-    return Api.post(`/service/atp/hasCod?cod=${cod}`)
+    return Api.post(`/service/atp/queryCod?cod=${cod}`)
 }
 
 export function edit(data) {

src/service/test/cty.js

@@ -21,17 +21,17 @@ export function edit(data) {
 }
 
 export function deleteById(inr) {
-    return Api.post(`/manager/cty/deleteById?inr=${inr}`)
+    return Api.post(`/service/cty/deleteById?inr=${inr}`)
 }
 
-export function addBopctyData(inr, data) {
-    return Api.post(`/service/cty/addBopctyData?inr=${inr}`, data)
-}
+// export function addBopctyData(inr, data) {
+//     return Api.post(`/service/cty/addBopctyData?inr=${inr}`, data)
+// }
 
-export function editBopctyData(inr, data) {
-    return Api.post(`/service/cty/editBopctyData?inr=${inr}`, data)
-}
+// export function editBopctyData(inr, data) {
+//     return Api.post(`/service/cty/editBopctyData?inr=${inr}`, data)
+// }
 
-export function deleteBopctyById(data) {
-    return Api.post(`/service/cty/deleteBopctyById`, data)
-}
+// export function deleteBopctyById(data) {
+//     return Api.post(`/service/cty/deleteBopctyById`, data)
+// }

src/service/test/cur.js

@@ -21,7 +21,7 @@ export function edit(data) {
 }
 
 export function deleteById(data) {
-    return Api.post(`/manager/cur/deleteById?inr=${data}`)
+    return Api.post(`/service/cur/deleteById?inr=${data}`)
 }
 
 // export function addAdrData(inr, data) {

src/service/test/ety.js

@@ -17,6 +17,6 @@ export function edit(data) {
 }
 
 export function deleteById(inr) {
-    return Api.post("/service/ety/deleteById", {inr})
+    return Api.post(`/service/ety/deleteById?inr=${inr}`)
 }
 

src/views/Layout/SideMenu.vue

@@ -205,7 +205,6 @@ export default {
         { inifrm: "infpty", ininam: "客户信息查询", pntmiu: "10" },
         { inifrm: "inftrl", ininam: "交易权限查询", pntmiu: "10" },
         { inifrm: "infusr", ininam: "柜员信息查询", pntmiu: "10" },
-        { inifrm: "infdia", ininam: "交易备忘录查询", pntmiu: "10" },
         // { inifrm: "gitset", ininam: "进口保函赔付", pntmiu: "13" },
         // { inifrm: "gitcrq", ininam: "进口保函索赔登记", pntmiu: "13" },
         { inifrm: "14", ininam: "服务管理", pntmiu: "" },

src/views/Statics/Atp/views/Dbiatp/AtpInfo.vue

@@ -160,11 +160,11 @@
     </c-col>
 	<c-col :span="24">
         <el-form-item label="交易处理时间" prop="dealtim">
-            <c-input-currency value="0.0" class="input-currency-left"
+            <c-input 
                 v-model="model.dealtim"
                 placeholder="请输入交易处理时间"
             >
-            </c-input-currency>
+            </c-input>
         </el-form-item>
     </c-col>
 </c-col>

src/views/Statics/btb/views/Dbibtb/BtbList.vue

@@ -85,7 +85,7 @@
         >
           <span>取 消</span>
         </button>
-        <c-button type="primary" @click="" v-if="operate === 'details'"
+        <c-button type="primary" @click="created" v-if="operate === 'details'"
         >确 定</c-button
         >
         <c-button type="primary" @click="editBtb" v-if="operate === 'edit'"

src/views/Statics/btb/views/Infbtb/Infsea.vue

@@ -26,8 +26,7 @@
     </c-col>
 
 
-    <c-col :span="24">
-      <c-col :span="12" style="text-align: right">
+      <c-col :span="24" style="text-align: right; height: 36.8px">
         <el-button size="small" @click="handleReset">重置</el-button>
         <el-button
           type="primary"
@@ -37,7 +36,7 @@
           >查询
         </el-button>
       </c-col>
-    </c-col>
+
     <c-col :span="24">
       <c-paging-table
         :data="btbData"

src/views/Statics/cty/views/Dbicty/index.vue

@@ -145,15 +145,16 @@ export default {
                 })
                 .catch((err) => {
                   this.$message.error("国家地区信息保存失败！");
-                });}else{
-            editBopctyData(this.model.inr,this.model)
-                .then((res) => {
-                  this.$message.success("收支申报国家代码表保存成功！");
-                  this.goBack(true)
-                })
-                .catch((err) => {
-                  this.$message.error("收支申报国家代码表保存失败！");
                 });
+              // }else{
+            // editBopctyData(this.model.inr,this.model)
+            //     .then((res) => {
+            //       this.$message.success("收支申报国家代码表保存成功！");
+            //       this.goBack(true)
+            //     })
+            //     .catch((err) => {
+            //       this.$message.error("收支申报国家代码表保存失败！");
+            //     });
           }
         } else {
           Utils.formValidateTips(this.$refs.modelForm.fields)
@@ -175,15 +176,16 @@ export default {
             })
             .catch((err) => {
               this.$message.error("国家地区信息删除失败！");
-            })}else{
-              deleteBopctyById(this.model)
-            .then((res) => {
-              this.$message.success("收支申报国家代码表删除成功！");
-              this.goBack(true)
-            })
-            .catch((err) => {
-              this.$message.error("收支申报国家代码表删除失败！");
             })
+          // }else{
+          //     deleteBopctyById(this.model)
+          //   .then((res) => {
+          //     this.$message.success("收支申报国家代码表删除成功！");
+          //     this.goBack(true)
+          //   })
+          //   .catch((err) => {
+          //     this.$message.error("收支申报国家代码表删除失败！");
+          //   })
             };
         })
         .catch(() => {