Merge remote-tracking branch 'origin/dev' into test

package.json

@@ -61,6 +61,7 @@
     "vue-cropper": "0.5.5",
     "vue-meta": "2.4.0",
     "vue-router": "3.4.9",
+    "vue-splitpane": "^1.0.6",
     "vue2-verify": "^1.1.5",
     "vuedraggable": "2.24.3",
     "vuex": "3.6.0"

src/main.js

@@ -48,6 +48,8 @@ import VueMeta from "vue-meta";
 // 字典数据组件
 import DictData from "@/components/DictData";
 
+import splitPane from 'vue-splitpane'
+
 // 去除控制台的 Vue warn 警告信息
 Vue.config.silent = true;
 
@@ -74,6 +76,7 @@ Vue.component("Editor", Editor);
 Vue.component("FileUpload", FileUpload);
 Vue.component("ImageUpload", ImageUpload);
 Vue.component("ImagePreview", ImagePreview);
+Vue.component('split-pane', splitPane);
 
 Vue.use(directive);
 Vue.use(plugins);

src/views/basic/product/bindProduct.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-card>
-      <el-form :model="filterQuery" size="mini" label-width="100px" v-show="showSearch">
+      <el-form :model="filterQuery" size="mini" label-width="100px"   v-show="showSearch">
         <el-row>
           <el-col :span="18">
             <el-form-item class="query-form-item" label="UDI码:">
@@ -107,6 +107,7 @@ import {bindBasicHospProduct, saveBasicHospType, getBindList} from "@/api/basic/
 import {saveRel, productList, SelectproductList} from "@/api/basic/basicCaterelType";
 
 import {sysFilter} from '@/api/basic/udiRelevance'
+import {isBlank} from "@/utils/strUtil";
 
 
 export default {
@@ -178,8 +179,15 @@ export default {
     },
 
     SelectInstentProduct(){
-      this.filterQuery.page = 1;
+      if( isBlank(this.filterQuery.udiCode) && isBlank(this.filterQuery.unionCode) &&
-      this.getselectList();
+        isBlank(this.filterQuery.cpmctymc) && isBlank(this.filterQuery.ggxh)
+        && isBlank(this.filterQuery.ylqxzcrbarmc)  && isBlank(this.filterQuery.thrPiId)){
+        this.$message("请先输入搜索条件!")
+        return;
+      }
+
+          this.filterQuery.page = 1;
+          this.getselectList();
     },
 
     getSysFilter() {

src/views/basic/product/product.vue

@@ -1925,7 +1925,6 @@ export default {
         isAdavence: row.isAdavence,
       };
       this.checked = row.isUseDy == 1;
-
       this.editQuery = row;
       //获取产品标识列表
       let ttquery = {

src/views/basic/product/productCategory.vue

@@ -1360,6 +1360,8 @@ import {finProductSet} from "@/api/param/systemParamConfig";
 export default {
   data() {
     return {
+      useNumEnable: true,
+      checked: false,
       sysList: [],
       productRemarkSet: {},
       inputQuery:{},
@@ -1461,7 +1463,6 @@ export default {
         isAdavence: row.isAdavence,
       };
       this.checked = row.isUseDy == 1;
-
       this.editQuery = row;
       //获取产品标识列表
       let ttquery = {

src/views/inout/IoUploadOrder.vue

@@ -580,6 +580,7 @@ export default {
       };
       this.actDateRange = [];
       this.auditDateRange = [];
+      this.getBusType();
       this.getList();
     },
     onSubmit() {

src/views/inventory/InvProductPlaceModify.vue

@@ -21,7 +21,6 @@
             :disabled="list.length > 0"
             @change="invChange"
             style="width: 90%"
-            clearable
           >
             <el-option
               v-for="item in invList"

src/views/system/print/pdfTmpleateManage.vue

@@ -598,7 +598,7 @@ export default {
         return
       }
       if (this.$refs.uploadJrxml.uploadFiles.length < 1 && !this.uploadDisabled) {
-        this.$message.warning(`请选择jasper文件`);
+        this.$message.warning(`请选择jrxml文件`);
         return
       }
       console.log(this.formName)

src/views/userManage/bindPlatformEditModel.vue

@@ -8,6 +8,7 @@
               <el-select
                   v-model="editLogin.sourceAction"
                   style="width: 100%"
+                  filterable
                   placeholder="请选择本地单据类型"
               >
                 <el-option
@@ -232,6 +233,21 @@ export default {
       this.editLogin.targetName = this.targetActions.find(item => item.action == this.editLogin.targetAction).name
     },
     linkSubmit() {
+
+      if(isBlank(this.editLogin.sourceAction)){
+          return this.$message.error("本地单据类型不能为空");
+      }
+      if(isBlank(this.editLogin.invCode)){
+        return this.$message.error("目标部门不能为空");
+      }
+      if(isBlank(this.editLogin.invSubCode)){
+        return this.$message.error("目标仓库不能为空");
+      }
+      if(isBlank(this.editLogin.targetAction)){
+        return this.$message.error("目标单据类型不能为空");
+      }
+
+
       linkPlatform(this.editLogin)
           .then((response) => {
             if (response.code == 20000) {

src/views/userManage/bindPlatformModel.vue

@@ -53,12 +53,12 @@
                 <el-input
                     v-model="editLogin.platformPassword"
                     placeholder="请输入密码"
-                    style="width: 81%"
+                    style="width: 70%"
                     size="small"
                     type="password"
                     show-password
                 ></el-input>
-                <el-button type="primary" style="margin-left: 7px;" @click.native="testUserInfo">
+                <el-button type="primary" style="margin-left: 2%;" @click.native="testUserInfo">
                   账号验证
                 </el-button>
               </el-form-item>
@@ -78,6 +78,7 @@
               <el-table-column label="操作" fixed="right">
                 <template slot-scope="scope">
                   <el-button type="text" size="small" :disabled="!check" @click.native.stop="addDelect(scope.row)">编辑</el-button>
+                  <el-button type="text" size="small" :disabled="!check" @click.native.stop="deleteDialog(scope.row)">删除</el-button>
                 </template>
               </el-table-column>
       </el-table>
@@ -111,7 +112,7 @@
 </template>
 
 <script>
-import {testUserInfo} from "@/api/userManage/platform";
+import {deletePlatform, testUserInfo} from "@/api/userManage/platform";
 import {getCorpLists, getPlatFormDelect} from "@/api/basic/basicUnitMaintain";
 import {getBussinessType} from "@/api/basic/bussinessType";
 import {isBlank} from "@/utils/strUtil";
@@ -256,7 +257,24 @@ export default {
     },
     closeDialog() {
       this.orderMutiVisible = false;
-      this.getList();
+      this.getPlatFormDelect();
+    },
+    deleteDialog(row) {
+      this.$confirm("确认删除该自助平台信息?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+          .then(() => {
+            let tQuery = {
+              id: row.id
+            };
+            deletePlatform(tQuery).then(() => {
+              this.getPlatFormDelect()
+            });
+          })
+          .catch(() => {
+          });
     },
     getLocalBussinessType() {
       let tQuery = {};
@@ -267,8 +285,8 @@ export default {
       });
     },
     handleCurrentChange(val) {
-      this.query.page = val;
+      this.query.page = val.page;
-      this.getList();
+      this.getPlatFormDelect();
     },
     addDelect(row){
       if(this.check=true){
@@ -278,6 +296,17 @@ export default {
         }else{
           this.formQuery=2;
           this.editLogin.id=row.id
+          this.editLogin.platformId = row.platformId;
+          this.editLogin.appid = row.appid;
+          this.editLogin.apiKey = row.apiKey;
+          this.editLogin.secretKey = row.secretKey;
+          this.editLogin.unitId = row.unitId;
+          this.editLogin.customerId = row.platformId
+          this.editLogin.sourceAction = row.sourceAction
+          this.editLogin.invCode = row.invCode
+          this.editLogin.invSubCode = row.invSubCode
+          this.editLogin.targetAction = row.targetAction
+          console.log(this.editLogin)
           this.editLoginVisible=true;
         }
       }else{