1.修改业务单据查询界面交互

src/api/basic/basicThirdSys.js

@@ -65,7 +65,7 @@ export function saveBusTypes(data) {
         url: "/udiwms/basic/thirdsys/saveBusTypes",
         method: "post",
         data: data
-    })
+    });
 }
 
 export function deleteThirdSysBusType(params) {
@@ -73,15 +73,15 @@ export function deleteThirdSysBusType(params) {
         url: "/udiwms/basic/thirdsys/delete",
         method: "get",
         params: params
-    })
+    });
 }
 
-export function enableInterfaces(data) {
+export function updateInterfaceStatus(data) {
     return axios({
-        url: "/udiwms/basic/thirdsys/enableInterfaces",
+        url: "/udiwms/basic/thirdsys/updateInterfaceStatus",
         method: "post",
         data: data
-    })
+    });
 }
 
 export function testThirdService(data) {
@@ -89,8 +89,7 @@ export function testThirdService(data) {
         url: "/udiwms/basic/thirdsys/testThirdService",
         method: "post",
         data: data
-    })
+    });
 }
 
 
-

src/views/basic/BasicThirdSys.vue

@@ -123,6 +123,13 @@
                         >编辑
                         </el-button
                         >
+                        <el-button
+                            type="text"
+                            size="small"
+                            @click.native.stop="disableInterface(scope.row)"
+                        >移除
+                        </el-button
+                        >
                     </template>
                 </el-table-column>
             </el-table>
@@ -161,18 +168,24 @@
             <el-table v-loading="busTypeLoading" :data="busTypeList" style="width: 100%">
                 <el-table-column label="序号" type="index" show-overflow-tooltip="true"></el-table-column>
                 <el-table-column label="单据类型" prop="name" show-overflow-tooltip="true"></el-table-column>
-                <el-table-column v-if="addBussinessTypeBtnVisible" label="第三方单据类型" prop="thirdBuyName"></el-table-column>
+                <el-table-column v-if="submitOrderVisible" label="第三方单据类型" prop="thirdBuyName"></el-table-column>
                 <el-table-column label="接口地址" prop="url" width="400" show-overflow-tooltip></el-table-column>
                 <el-table-column label="备注" prop="remark" show-overflow-tooltip></el-table-column>
 
                 <el-table-column label="操作" width="200" prop="price" fixed="right">
                     <template slot-scope="scope">
-                        <el-button
+                        <el-button v-if="submitOrderVisible"
                             type="text"
                             size="small"
                             @click="handleEdit(scope.$index, scope.row)"
                         >编辑
                         </el-button>
+                        <el-button v-if="getOrdersEditBtnVisible"
+                            type="text"
+                            size="small"
+                            @click="editGeOrderParam(scope.$index, scope.row)"
+                        >编辑
+                        </el-button>
                         <el-button
                             type="text"
                             size="small"
@@ -189,7 +202,7 @@
 
         </el-card>
 
-        <!--添加单据类型弹窗-->
+        <!--业务单据提交编辑弹窗-->
         <el-dialog
             :title="formMap[formName]"
             :close-on-click-modal="false"
@@ -204,7 +217,7 @@
                            <div class="itemTag">
                                <span>单据类型:&nbsp;</span>
                            </div>
-                           <el-select style="width: 350px;" v-model="thirdBuyForm.name" placeholder="单据类型">
+                           <el-select style="width: 300px;" v-model="thirdBuyForm.name" placeholder="单据类型">
                                 <el-option
                                     v-for="item in bussinessTypeList"
                                     :key="item.action"
@@ -220,7 +233,7 @@
                            <div class="itemTag">
                                <span>第三方单据类型:&nbsp;</span>
                            </div>
-                           <el-select style="width: 350px;" v-model="thirdBuyForm.thirdBuyName" placeholder="第三方单据类型">
+                           <el-select style="width: 300px;" v-model="thirdBuyForm.thirdBuyName" placeholder="第三方单据类型">
                                <el-option
                                     v-for="item in thirdBuyList"
                                     :key="item.name"
@@ -239,7 +252,7 @@
                                <span>接口地址:&nbsp;</span>
                            </div>
                            <el-input
-                               style="width: 350px"
+                               style="width: 300px"
                                size="small"
                                splaceholder="请输入内容"
                                v-model="thirdBuyForm.url"
@@ -253,7 +266,7 @@
                                <span>备注:&nbsp;</span>
                            </div>
                            <el-input
-                               style="width: 350px"
+                               style="width: 300px"
                                size="small"
                                splaceholder="请输入内容"
                                v-model="thirdBuyForm.remark"
@@ -277,6 +290,80 @@
 
         </el-dialog>
 
+        <!--业务单据查询编辑弹窗-->
+        <el-dialog
+            :title="formMap[formName]"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
+            :visible.sync="editGeOrderParamVisible"
+            style="width: 100%"
+        >
+            <div>
+                <el-row :gutter="20" class="el-row" type="flex">
+                    <el-col :span="10" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>单据类型:&nbsp;</span>
+                            </div>
+                            <el-select style="width: 280px;" v-model="thirdBuyForm.name" placeholder="单据类型">
+                                <el-option
+                                    v-for="item in thirdBuyList"
+                                    :key="item.code"
+                                    :label="item.name"
+                                    :value="item.name"
+                                ></el-option>
+                            </el-select>
+                        </div>
+                    </el-col>
+
+                    <el-col :span="10" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>接口地址:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 280px"
+                                size="small"
+                                splaceholder="请输入内容"
+                                v-model="thirdBuyForm.url"
+                            ></el-input>
+                        </div>
+                    </el-col>
+
+                </el-row>
+
+                <el-row :gutter="20" class="el-row" type="flex">
+
+                    <el-col :span="10" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>备注:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 280px"
+                                size="small"
+                                splaceholder="请输入内容"
+                                v-model="thirdBuyForm.remark"
+                            ></el-input>
+                        </div>
+                    </el-col>
+                </el-row>
+            </div>
+
+            <div slot="footer" class="dialog-footer">
+                <el-button @click.native="editGeOrderParamVisible = !editGeOrderParamVisible"
+                >取消
+                </el-button
+                >
+                <el-button
+                    type="primary"
+                    @click.native="addBussinessTypeData()"
+                >保存
+                </el-button>
+            </div>
+
+        </el-dialog>
+
         <el-dialog
             title="添加接口"
             :close-on-click-modal="false"
@@ -311,9 +398,11 @@
 import {
     getBasicThirdSys,
     updateBasicThirdSys, getDetailBasicThirdSys, updateDetailBasicThirdSys, filterBusTypeDetail, saveBusTypeDetail,
-    saveBusTypes, deleteThirdSysBusType, enableInterfaces
+    saveBusTypes, deleteThirdSysBusType, updateInterfaceStatus
 } from "../../api/basic/basicThirdSys";
 
+import {getOriginBusType} from "../../api/basic/busOriginType";
+
 import modifyDialog from "./BasicThirdSysModify";
 import modifyDetailDialog from "./BasicThirdSysDetailModify";
 import {filterForThirdSys} from "../../api/basic/busLocalType";
@@ -359,7 +448,10 @@ export default {
             bussinessTypeFormVisible: false,
             bussinessTypeList: [],
             addBussinessTypeBtnVisible: false,
+            editGeOrderParamVisible: false,
             addInterfaceVisible: false,
+            getOrdersEditBtnVisible: false,
+            submitOrderVisible: false,
             selectBussinessTypeList: [],
             thirdSysFk: null,
             submitOrderRow: null,
@@ -407,9 +499,15 @@ export default {
         },
         handleBustypeChange(row) {
             this.getBustyList(row);
+            this.submitOrderRow = row;
             if (row.key === "orderSubmitUrl") {
                 this.addBussinessTypeBtnVisible = true;
-                this.submitOrderRow = row;
+                this.submitOrderVisible = true;
+                this.getOrdersEditBtnVisible = false;
+            } else if (row.key === "orderQueryUrl") {
+                this.addBussinessTypeBtnVisible = true;
+                this.getOrdersEditBtnVisible = true;
+                this.submitOrderVisible = false;
             } else {
                 this.addBussinessTypeBtnVisible = false;
             }
@@ -528,6 +626,7 @@ export default {
                 thirdBuyCode: row.thirdBuyCode,
                 thirdBuyName: row.thirdBuyName,
                 type: row.type,
+                url: row.url,
                 thirdSys: row.thirdSys,
                 remark: row.remark
             };
@@ -541,20 +640,35 @@ export default {
             })
         },
         addBussinessType() {
-            this.bussinessTypeFormVisible = true;
             this.formName = "add";
-            this.getBussinessType();
+            if (this.submitOrderVisible) {
-            this.getThirdBuyType();
+                this.bussinessTypeFormVisible = true;
-            this.thirdBuyForm = {
+                this.getBussinessType();
-                id: null,
+                this.getThirdBuyType();
-                code: null,
+                this.thirdBuyForm = {
-                name: null,
+                    id: null,
-                thirdBuyCode: null,
+                    code: null,
-                thirdBuyName: null,
+                    name: null,
-                type: null,
+                    thirdBuyCode: null,
-                thirdSys: null,
+                    thirdBuyName: null,
-                remark: null
+                    type: 2,
-            };
+                    url: null,
+                    thirdSys: this.thirdSysFk,
+                    remark: null
+                };
+            } else if (this.getOrdersEditBtnVisible) {
+                this.editGeOrderParamVisible = true;
+                this.getThirdBuyType();
+                this.thirdBuyForm = {
+                    id: null,
+                    code: null,
+                    name: null,
+                    type: 1,
+                    url: null,
+                    thirdSys: this.thirdSysFk,
+                    remark: null
+                };
+            }
         },
         getBussinessType() {
             filterForThirdSys().then((res) => {
@@ -562,13 +676,13 @@ export default {
             })
         },
         addBussinessTypeData() {
-            this.bussinessTypeFormVisible = false;
+            if (this.getOrdersEditBtnVisible) {
-            //新增
+                this.editGeOrderParamVisible = false;
-            if (this.formName == "add") {
+            } else {
-                this.thirdBuyForm.type = 2;
+                this.bussinessTypeFormVisible = false;
-                this.thirdBuyForm.thirdSys = this.thirdSysFk;
             }
 
+
             //匹配编码
             this.bussinessTypeList.forEach(item =>{
                 //单据业务类型编码
@@ -580,7 +694,7 @@ export default {
             this.thirdBuyList.forEach(item => {
                 //第三方单据类型编码
                 if (item.name === this.thirdBuyForm.thirdBuyName) {
-                    this.thirdBuyForm.thirdBuyCode = item.code;
+                    this.thirdBuyForm.thirdBuyCode = item.action;
                 }
             });
 
@@ -600,10 +714,9 @@ export default {
         },
         getThirdBuyType() {
             let query = {
-                thirdSysFk: this.thirdSysFk,
+                thirdSys: this.thirdSysFk
-                type: 1,
             }
-            filterBusTypeDetail(query).then((res)=> {
+            getOriginBusType(query).then((res)=> {
                 this.thirdBuyList = res.data.list;
             });
         },
@@ -631,8 +744,20 @@ export default {
             });
         },
         addInterfaceData(){
-            this.addInterfaceVisible = false;
+            let data = [];
-            enableInterfaces(this.selectInterfaceList).then((res) => {
+            if (this.selectInterfaceList.length > 0) {
+                this.addInterfaceVisible = false;
+                this.selectInterfaceList.forEach(id => {
+                    let item = {
+                        id: id,
+                        enabled: true
+                    };
+                    data.push(item);
+                })
+            } else {
+                this.$message.warning("请选择需要添加的接口");
+            }
+            updateInterfaceStatus(data).then((res) => {
                 if (res.code === 20000) {
                     this.selectInterfaceList = [];
                     this.$message.success("添加成功");
@@ -655,7 +780,45 @@ export default {
                 }
             }).catch((error) => {
                 this.$message.error("添加失败");
+            });
+        },
+        disableInterface(row) {
+            let data = [{id: row.id, enabled: false}];
+            updateInterfaceStatus(data).then((res) => {
+                if (res.code === 20000) {
+                    this.$message.success("移除成功");
+                    let query = {
+                        thirdSysFk: this.thirdSysFk,
+                        enabled: true
+                    };
+                    this.loading = true;
+                    getDetailBasicThirdSys(query)
+                        .then((response) => {
+                            this.loading = false;
+                            this.detailList = response.data.list || [];
+                            this.total = response.data.total || 0;
+                        })
+                        .catch(() => {
+                            this.loading = false;
+                            this.list = [];
+                            this.total = 0;
+                        });
+                }
             })
+        },
+        editGeOrderParam(index,row) {
+            this.formName = "edit";
+            this.editGeOrderParamVisible = true;
+            this.getThirdBuyType();
+            this.thirdBuyForm = {
+                id: row.id,
+                code: row.code,
+                name: row.name,
+                type: row.type,
+                url: row.url,
+                thirdSys: this.thirdSysFk,
+                remark: row.remark
+            };
         }
     },
     components: {
@@ -686,5 +849,13 @@ export default {
     flex-wrap: wrap;
 }
 
+.itemTag {
+    float: left;
+    text-align: left;
+    margin-top: 10px;
+    width: 100px;
+    margin-bottom: 5px;
+}
+
 </style>
 

src/views/thrsys/SysUdimsData.vue

@@ -22,10 +22,9 @@
                         <el-button-group style="display:flex;">
                             <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
                             <el-button type="primary" icon="search" @click="getList">查询</el-button>
-                           <!-- <el-button type="primary" icon="search" @click="createSchedule(1)">同步单据</el-button>
+                            <el-button type="primary" icon="search" @click="createSchedule(1)">同步单据</el-button>
                             <el-button type="primary" icon="search" @click="createSchedule(2)">同步单据类型</el-button>
                             <el-button type="primary" icon="search" @click="createSchedule(3)">同步基础信息</el-button>
-                            <el-button type="primary" icon="search" @click="createSchedule(4)">同步国家库DI数据</el-button>-->
                         </el-button-group>
                     </el-form-item>
                 </el-row>
@@ -123,9 +122,9 @@ export default {
             currentRow: null,
             editQuery: null,
             type: {
-                "AutoDownloadOrder": "已完成单据",
+                "AutoUploadOrder": "已完成单据",
-                "AutoDownloadBusType": "单据类型",
+                "AutoUploadBusType": "单据类型",
-                "AutoDownloadAllData": "基础信息",
+                "AutoUploadAllData": "基础信息",
                 "AutoDownloadDiProducts": "国家库DI数据"
             },
             status: {