wangzhuo 1 年之前
父節點
當前提交
421f100bbf

+ 4 - 1
src/views/iosBasicData/baccelements/index.vue

@@ -102,8 +102,11 @@ export default {
         total: 0
       },
       selectionList: [],
-      option: {},
+      option: {
+        dialogDrag: true,
+      },
       optionBack: {
+        dialogDrag: true,
         addBtnText: '新建核算要素',
         addTitle: '新建核算要素',
         editBtnText: '编辑',

+ 5 - 2
src/views/iosBasicData/bcntrtypes/index.vue

@@ -166,8 +166,11 @@ export default {
         total: 0
       },
       selectionList: [],
-      option: {},
+      option: {
+        dialogDrag: true,
+      },
       optionBack: {
+        dialogDrag: true,
         addBtnText: '新建集装箱',
         addTitle: '新建集装箱',
         editBtnText: '编辑',
@@ -628,7 +631,7 @@ export default {
         this.$message.warning("请选择至少一条数据");
         return;
       }
-      
+
       for (const selection of this.selectionList) {
         if (selection.status == 0) {
           this.$message.warning("选中的数据中有启用数据,启用数据不可删除!");

+ 4 - 1
src/views/iosBasicData/bcommodity/index.vue

@@ -118,8 +118,11 @@ export default {
           }
         ]
       },
-      option: {},
+      option: {
+        dialogDrag: true,
+      },
       optionBack: {
+        dialogDrag: true,
         addBtnText: '新建货物',
         addTitle: '新建货物',
         editBtnText: '编辑',

+ 37 - 8
src/views/iosBasicData/bcorps/detailsPage.vue

@@ -23,7 +23,7 @@
                 :disabled="item.disabled"></el-option>
             </el-select> -->
               <avue-input-tree :check-strictly="true" @change="corpTypeChange" multiple v-model="formData.corpTypeList"
-                placeholder="请选择内容" :props="{ label: 'cnName', value: 'id' , disabled: 'status'}" :dic="customTypeData"
+                placeholder="请选择内容" :props="{ label: 'cnName', value: 'id', disabled: 'status' }" :dic="customTypeData"
                 :style="{ width: '100%' }"></avue-input-tree>
             </el-form-item>
           </el-col>
@@ -131,7 +131,8 @@
                 <el-form-item label="国家" prop="cntyCode">
                   <search-query ref="SearchQuery" :datalist="cntyOptions" title="国家" :filterable="true" :clearable="true"
                     :remote="true" :forParameter="{ key: 'id', label: 'cnName', value: 'code', disabled: 'status' }"
-                    :disabledStatus="1":selectValue="formData.cntyCode" @remoteMethod="bcountrysListfun" @corpChange="bcountrysChange">
+                    :disabledStatus="1" :selectValue="formData.cntyCode" @remoteMethod="bcountrysListfun"
+                    @corpChange="bcountrysChange">
                     <bcountrys></bcountrys>
                   </search-query>
                 </el-form-item>
@@ -227,6 +228,16 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8">
+                <el-form-item label="分管员" prop="adminProfiles">
+                  <el-select v-model="formData.adminProfilesList" multiple @change="adminProfilesChange" filterable
+                    placeholder="请选择分管员" :style="{ width: '100%' }">
+                    <el-option v-for="item in userOptions" :key="index" :label="item.realName" :value="item.id"
+                      :disabled="item.disabled">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
                 <el-form-item label="存在HP/S" prop="isPs">
                   <el-switch v-model="formData.isPs" :active-value="1" :inactive-value="0" active-text="开启"
                     inactive-text="关闭"></el-switch>
@@ -960,6 +971,7 @@ export default {
       getBcorpsDetail(this.detailData.id).then(res => {
         this.formData = res.data.data
         this.formData.corpTypeList = res.data.data.corpType.split(',')
+        this.$set(this.formData, 'adminProfilesList', res.data.data.adminProfiles.split(','))
       })
     }
     if (this.detailData.corpType != null) {
@@ -979,7 +991,7 @@ export default {
       this.customTypeData = res.data.data.records
     })
     // 查询用户信息
-    userList().then((res) => {
+    userList(1, 9999999).then((res) => {
       this.userOptions = res.data.data
     });
     // 查询字典
@@ -1022,10 +1034,10 @@ export default {
     },
     bcountrysChange(value) {
       this.formData.cntyCode = value
-      for(let item of this.cntyOptions) {
-          if (item.code == value) {
-              this.formData.cntyName = item.cnName
-          }
+      for (let item of this.cntyOptions) {
+        if (item.code == value) {
+          this.formData.cntyName = item.cnName
+        }
       }
     },
     rateChange(value) {
@@ -1036,6 +1048,23 @@ export default {
         }
       }
     },
+    adminProfilesChange(value) {
+      if (value != null && value != []) {
+        this.formData.adminProfiles = value.join(",")
+      }
+      var userName = [];
+      for (var userId of value) {
+        for (var user of this.userOptions) {
+          if (user.id == userId) {
+            userName.push(user.realName)
+            break;
+          }
+        }
+      }
+      if (userName != null && userName != []) {
+        this.formData.adminProfilesName = userName.join(',')
+      }
+    },
     submitForm() {
       this.$refs['userDataForm'].validate(valid => {
         if (!valid) return
@@ -1239,7 +1268,7 @@ export default {
         corpsBankList: [],
         corpsFilesList: [],
       }
-      this.detailData= {}
+      this.detailData = {}
       this.corpsAttnForm = {}
       this.corpsAttnDialogVisible = false,
         this.corpsAttnDialogIndex = null,

+ 1 - 1
src/views/iosBasicData/bcorps/index.vue

@@ -142,7 +142,7 @@
     <detailPage v-if="!isShow" ref="detail" @goBack="goBack" @copyOrder="copyOrder" :detailData="detailData"></detailPage>
 
     <!--类别弹窗-->
-    <el-dialog title="类别" :visible.sync="corpTypeVisible" append-to-body width="60%" :before-close="corpTypeClose">
+    <el-dialog title="类别" v-dialogdrag :visible.sync="corpTypeVisible" append-to-body width="60%" :before-close="corpTypeClose">
       <div>
         <bcorpstypedefine></bcorpstypedefine>
       </div>

+ 14 - 11
src/views/iosBasicData/bcountrys/index.vue

@@ -19,7 +19,7 @@
                 </avue-text-ellipsis>
             </template>
             <template slot="cnName" slot-scope="scope">
-                <div style="color: #1e9fff;cursor: pointer;" @click.stop="rowViewfun(scope.row,scope.index)">
+                <div style="color: #1e9fff;cursor: pointer;" @click.stop="rowViewfun(scope.row, scope.index)">
                     <avue-text-ellipsis :text="scope.row.cnName" :height="30" use-tooltip placement="top">
                         <small slot="more">...</small>
                     </avue-text-ellipsis>
@@ -41,11 +41,11 @@
             </template>
             <template slot-scope="{ row, index }" slot="menu">
                 <el-button v-if="row.status == 1" type="text" icon="el-icon-turn-off" style="color: #85e967" size="small"
-                           @click.stop="statusfun(row.id,0)">
+                    @click.stop="statusfun(row.id, 0)">
                     启用
                 </el-button>
                 <el-button v-if="row.status == 0" type="text" icon="el-icon-turn-off" style="color: #e83c3a" size="small"
-                           @click.stop="statusfun(row.id,1)">
+                    @click.stop="statusfun(row.id, 1)">
                     停用
                 </el-button>
             </template>
@@ -119,8 +119,11 @@ export default {
                 pageSizes: [10, 20, 30, 40, 50, 100, 200, 300, 400, 500]
             },
             selectionList: [],
-            option: {},
+            option: {
+                dialogDrag: true,
+            },
             optionBack: {
+                dialogDrag: true,
                 addBtnText: '新建国家',
                 addTitle: '新建国家',
                 editBtnText: '编辑',
@@ -138,7 +141,7 @@ export default {
                 viewBtn: true,
                 selection: true,
                 dialogClickModal: false,
-                menuWidth:260,
+                menuWidth: 260,
                 column: [
                     {
                         label: "编码",
@@ -265,16 +268,16 @@ export default {
     },
     methods: {
         // 禁用启用按钮
-        statusfun(id,status){
+        statusfun(id, status) {
             this.$confirm("确定将选择数据更改状态?", {
                 confirmButtonText: "确定",
                 cancelButtonText: "取消",
                 type: "warning"
-            }).then(()=>{
-                bcountrysDetail(id).then(res=>{
+            }).then(() => {
+                bcountrysDetail(id).then(res => {
                     let obj = res.data.data;
                     obj.status = status
-                    bcountrysSubmit(obj).then(()=>{
+                    bcountrysSubmit(obj).then(() => {
                         this.onLoad(this.page);
                         this.$message({
                             type: "success",
@@ -285,8 +288,8 @@ export default {
             })
         },
         // 编辑点击打开弹窗
-        rowViewfun(row,index){
-            this.$refs.crud.rowView(row,index)
+        rowViewfun(row, index) {
+            this.$refs.crud.rowView(row, index)
         },
         // 导出
         handleExport() {

+ 10 - 7
src/views/iosBasicData/bfeesdefine/index.vue

@@ -35,22 +35,22 @@
             </template>
             <template slot="unitNoForm">
               <search-query ref="SearchQuery" :datalist="unitNoData" title="计量单位" :filterable="true" :clearable="true"
-                :remote="true" :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }" @remoteMethod="getBunitsListfun"
-                @corpChange="unitNoCorpChange">
+                :remote="true" :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
+                @remoteMethod="getBunitsListfun" @corpChange="unitNoCorpChange">
                 <bunits></bunits>
               </search-query>
             </template>
             <template slot="curNoForm">
               <search-query ref="SearchQuery" :datalist="curNoData" title="币别" :filterable="true" :clearable="true"
-                :remote="true" :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }" @remoteMethod="getRateListfun"
-                @corpChange="curNoCorpChange">
+                :remote="true" :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
+                @remoteMethod="getRateListfun" @corpChange="curNoCorpChange">
                 <rateManagement></rateManagement>
               </search-query>
             </template>
             <template slot="feesTypeNameForm">
               <search-query ref="SearchQuery" :datalist="feesTypeData" title="费用类别" :filterable="true" :clearable="true"
-                :remote="true" :forParameter="{ key: 'id', label: 'cnName', value: 'id' }" @remoteMethod="bfeesdefineListfun"
-                @corpChange="feesTypeCorpChange">
+                :remote="true" :forParameter="{ key: 'id', label: 'cnName', value: 'id' }"
+                @remoteMethod="bfeesdefineListfun" @corpChange="feesTypeCorpChange">
                 <bfeesdetype></bfeesdetype>
               </search-query>
             </template>
@@ -191,8 +191,11 @@ export default {
         total: 0
       },
       selectionList: [],
-      option: {},
+      option: {
+        dialogDrag: true,
+      },
       optionBack: {
+        dialogDrag: true,
         addBtnText: '新建费用信息',
         addTitle: '新建费用信息',
         editBtnText: '编辑',

+ 4 - 1
src/views/iosBasicData/blines/index.vue

@@ -176,8 +176,11 @@ export default {
         total: 0
       },
       selectionList: [],
-      option: {},
+      option: {
+        dialogDrag: true,
+      },
       optionBack: {
+        dialogDrag: true,
         addBtnText: '新建航线',
         addTitle: '新建航线',
         editBtnText: '编辑航线',

+ 4 - 1
src/views/iosBasicData/blocations/index.vue

@@ -102,8 +102,11 @@ export default {
         total: 0
       },
       selectionList: [],
-      option: {},
+      option: {
+        dialogDrag: true,
+      },
       optionBack: {
+        dialogDrag: true,
         addBtnText: '新建地址信息',
         addTitle: '新建地址信息',
         editBtnText: '编辑',

+ 9 - 6
src/views/iosBasicData/bpackages/index.vue

@@ -174,8 +174,11 @@ export default {
         ageSizes: [10, 20, 30, 40, 50, 100, 200, 300, 400, 500]
       },
       selectionList: [],
-      option: {},
+      option: {
+        dialogDrag: true,
+      },
       optionBack: {
+        dialogDrag: true,
         addBtnText: '新建包装',
         addTitle: '新建包装',
         editBtnText: '编辑包装',
@@ -585,12 +588,12 @@ export default {
         return;
       }
 
-        for (const selection of this.selectionList) {
-          if (selection.status == 0) {
-            this.$message.warning("选中的数据中有启用数据,启用数据不可删除!");
-            return;
-          }
+      for (const selection of this.selectionList) {
+        if (selection.status == 0) {
+          this.$message.warning("选中的数据中有启用数据,启用数据不可删除!");
+          return;
         }
+      }
       this.$confirm("确定将选择数据删除?", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",

+ 4 - 1
src/views/iosBasicData/bports/index.vue

@@ -133,8 +133,11 @@ export default {
         total: 0
       },
       selectionList: [],
-      option: {},
+      option: {
+        dialogDrag: true,
+      },
       optionBack: {
+        dialogDrag: true,
         addBtnText: '新建港口ss',
         addTitle: '新建港口',
         editBtnText: '编辑港口',

+ 4 - 1
src/views/iosBasicData/bserviceterms/index.vue

@@ -162,8 +162,11 @@ export default {
         total: 0
       },
       selectionList: [],
-      option: {},
+      option: {
+        dialogDrag: true,
+      },
       optionBack: {
+        dialogDrag: true,
         height: 'auto',
         stripe: true,
         calcHeight: 30,

+ 4 - 1
src/views/iosBasicData/btrademodes/index.vue

@@ -112,8 +112,11 @@ export default {
         total: 0
       },
       selectionList: [],
-      option: {},
+      option: {
+        dialogDrag: true,
+      },
       optionBack: {
+        dialogDrag: true,
         height: 'auto',
         stripe: true,
         calcHeight: 30,

+ 4 - 1
src/views/iosBasicData/bunits/index.vue

@@ -102,8 +102,11 @@ export default {
         total: 0
       },
       selectionList: [],
-      option: {},
+      option: {
+        dialogDrag: true,
+      },
       optionBack: {
+        dialogDrag: true,
         addBtnText: '新建计量单位',
         addTitle: '新建计量单位',
         editBtnText: '编辑',

+ 4 - 1
src/views/iosBasicData/bvessels/index.vue

@@ -176,8 +176,11 @@ export default {
         total: 0
       },
       selectionList: [],
-      option: {},
+      option: {
+        dialogDrag: true,
+      },
       optionBack: {
+        dialogDrag: true,
         addBtnText: '新建船名',
         addTitle: '新建船名',
         editBtnText: '编辑船名',

+ 4 - 1
src/views/iosBasicData/losbfeestemplate/index.vue

@@ -174,8 +174,11 @@ export default {
         total: 0
       },
       selectionList: [],
-      option: {},
+      option: {
+        dialogDrag: true,
+      },
       optionBack: {
+        dialogDrag: true,
         height: 'auto',
         calcHeight: 30,
         tip: false,