caojunjie 1 рік тому
батько
коміт
0160db61f4

+ 0 - 5
src/views/iosBasicData/SeafreightExportF/bills/assembly/feecenter.vue

@@ -1919,11 +1919,6 @@
                                     return
                                 }
                             }
-                            // if ()
-                            // if (row.feeCnName == 'PS') {
-                            //     this.$message.warning('费用简称是PS只能选择USD')
-                            //     return
-                            // }
                             this.$set(row,'curCode',item.code)
                             this.$set(row,'exrate',item.exrate)
                             this.$set(row,'amount',Number(row.price) * Number(row.quantity?row.quantity:0))

+ 128 - 63
src/views/system/dept.vue

@@ -1,65 +1,66 @@
 <template>
-  <basic-container>
-    <avue-crud :option="option"
-               :table-loading="loading"
-               :data="data"
-               ref="crud"
-               v-model="form"
-               :permission="permissionList"
-               :before-open="beforeOpen"
-               :before-close="beforeClose"
-               @row-del="rowDel"
-               @row-update="rowUpdate"
-               @row-save="rowSave"
-               @search-change="searchChange"
-               @search-reset="searchReset"
-               @selection-change="selectionChange"
-               @current-change="currentChange"
-               @size-change="sizeChange"
-               @refresh-change="refreshChange"
-               @on-load="onLoad"
-               @tree-load="treeLoad">
-      <template slot="menuLeft">
-        <el-button type="danger"
-                   size="small"
-                   icon="el-icon-delete"
-                   v-if="permission.dept_delete"
-                   plain
-                   @click="handleDelete">删 除
-        </el-button>
-      </template>
-      <template slot-scope="scope" slot="menu">
-        <el-button
-          type="text"
-          icon="el-icon-circle-plus-outline"
-          size="small"
-          @click.stop="handleAdd(scope.row,scope.index)"
-          v-if="userInfo.role_name.includes('admin')"
-        >新增子项
-        </el-button>
-      </template>
-      <template slot-scope="{row}"
-                slot="deptCategory">
-        <el-tag>{{row.deptCategoryName}}</el-tag>
-      </template>
+  <div>
+      <basic-container>
+          <avue-crud :option="option"
+                     :table-loading="loading"
+                     :data="data"
+                     ref="crud"
+                     v-model="form"
+                     :permission="permissionList"
+                     :before-open="beforeOpen"
+                     :before-close="beforeClose"
+                     @row-del="rowDel"
+                     @row-update="rowUpdate"
+                     @row-save="rowSave"
+                     @search-change="searchChange"
+                     @search-reset="searchReset"
+                     @selection-change="selectionChange"
+                     @current-change="currentChange"
+                     @size-change="sizeChange"
+                     @refresh-change="refreshChange"
+                     @on-load="onLoad"
+                     @tree-load="treeLoad">
+              <template slot="menuLeft">
+                  <el-button type="danger"
+                             size="small"
+                             icon="el-icon-delete"
+                             v-if="permission.dept_delete"
+                             plain
+                             @click="handleDelete">删 除
+                  </el-button>
+              </template>
+              <template slot-scope="scope" slot="menu">
+                  <el-button
+                      type="text"
+                      icon="el-icon-circle-plus-outline"
+                      size="small"
+                      @click.stop="handleAdd(scope.row,scope.index)"
+                      v-if="userInfo.role_name.includes('admin')"
+                  >新增子项
+                  </el-button>
+              </template>
+              <template slot-scope="{row}"
+                        slot="deptCategory">
+                  <el-tag>{{row.deptCategoryName}}</el-tag>
+              </template>
 
-        <template slot-scope="{row}"
-                  slot="polCnNameForm">
-            <search-query :datalist="polData"
-                          :selectValue="form.polCnName"
-                          :filterable="true"
-                          :clearable="true"
-                          :remote="true"
-                          :buttonIf="false"
-                          :forParameter="{key:'id',label:'cnName',value:'cnName'}"
-                          @remoteMethod="polBportsListfun($event,'polCnName')"
-                          @corpChange="corpChange($event,'polCnName')"
-                          @corpFocus="polBportsListfun($event,'polCnName')" >
-            </search-query>
-        </template>
-
-    </avue-crud>
-  </basic-container>
+              <template slot-scope="{row}"
+                        slot="polCnNameForm">
+                  <search-query :datalist="polData"
+                                :selectValue="form.polCnName"
+                                :filterable="true"
+                                :clearable="true"
+                                :remote="true"
+                                :buttonIf="false"
+                                :forParameter="{key:'id',label:'cnName',value:'cnName'}"
+                                @remoteMethod="polBportsListfun($event,'polCnName')"
+                                @corpChange="corpChange($event,'polCnName')"
+                                @corpFocus="polBportsListfun($event,'polCnName')" >
+                  </search-query>
+              </template>
+          </avue-crud>
+      </basic-container>
+  </div>
 </template>
 
 <script>
@@ -75,13 +76,14 @@
   import website from '@/config/website';
   import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
   import {bportsList} from "@/api/iosBasicData/bports";
+  import {getToken} from "@/util/auth";
 
   export default {
       components: {SearchQuery},
     data() {
       return {
-          // 装货港数据
-          polData:[],
+        // 装货港数据
+        polData:[],
         form: {},
         selectionList: [],
         query: {},
@@ -202,12 +204,75 @@
                   editDisplay:false,//当前行数据在编辑表单中是否可见
                   viewDisplay:false, // 当前行数据在查看表单中是否可见
               },
+              {
+                  label: "英文全称",
+                  prop: "englishFullName",
+                  overHidden:true,
+              },
+              {
+                  label: "联系电话",
+                  prop: "tel",
+                  overHidden:true,
+              },
+              {
+                  label: "fax",
+                  prop: "fax",
+                  overHidden:true,
+              },
+              {
+                  label: "邮箱",
+                  prop: "email",
+                  overHidden:true,
+              },
+              {
+                  label: "网站",
+                  prop: "website",
+                  overHidden:true,
+              },
+              {
+                  label: "开户银行",
+                  prop: "bankOfDeposit",
+                  overHidden:true,
+              },
+              {
+                  label: "银行地址",
+                  prop: "bankAddress",
+                  overHidden:true,
+              },
+              {
+                  label: "人民币账号",
+                  prop: "rmbAccount",
+                  overHidden:true,
+              },
+              {
+                  label: "美金账号",
+                  prop: "usdAccount",
+                  overHidden:true,
+              },
+              {
+                  label: "swift代码",
+                  prop: "swiftCode",
+                  overHidden:true,
+              },
+              {
+                  label: "logo地址",
+                  prop: "logoUrl",
+                  type: "upload",
+                  listType: "picture-img",
+                  tip: "只能上传jpg/png/jpeg文件,且不超过2M",
+                  action: "/api/blade-resource/oss/endpoint/put-file",
+                  dataType: "string",
+                  propsHttp: {
+                      res: "data",
+                      url: "link"
+                  },
+              },
             {
               label: "排序",
               prop: "sort",
               type: "number",
               align: "right",
-              width: 80,
+              width: 60,
               rules: [{
                 required: true,
                 message: "请输入排序",