新增数据权限查询条件

package.json

@@ -20,6 +20,7 @@
     "bpmn-js": "8.9.0",
     "bpmn-js-properties-panel": "0.46.0",
     "bpmn-js-token-simulation": "0.10.0",
+    "build": "^0.1.4",
     "core-js": "^3.25.0",
     "countup.js": "^2.3.2",
     "cropperjs": "^1.5.12",

qiankun_config/store.js

@@ -23,6 +23,9 @@ export default function (state) {
   if (state.user?.authorities) {
     store.commit('user/setAuthorities', state.user.authorities);
   }
+  if (state.user?.authorityDept) {
+    store.dispatch('user/getCurrentUserAuthorityDept');
+  }
 }
 
 export const createMutationObserve = ({ modules = [] }) => {

src/api/login/index.js

@@ -41,4 +41,15 @@ export async function getCode (code) {
     return res.data.data;
   }
   return Promise.reject(new Error(res.data.message));
-}
+}
+/**
+ * 获取当前登陆用户数据权限部门数据
+ * @param
+ */
+export async function getCurrentUserAuthorityDeptAPI () {
+  const res = await request.post('/main/user/getCurrentUserAuthorityDepts');
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}

src/components/authSelection/index.vue

@@ -0,0 +1,75 @@
+<template>
+  <div>
+    <ele-tree-select
+      clearable
+      :data="deptTreeList"
+      v-model="selectVal"
+      valueKey="id"
+      labelKey="name"
+      :show-checkbox="true"
+      :check-strictly="true"
+      multiple
+      collapseTags
+      filterable
+      placeholder="请选择"
+      default-expand-all
+    />
+  </div>
+</template>
+<script>
+  import { mapGetters } from 'vuex';
+
+  export default {
+    name: 'index',
+    model: {
+      prop: 'value',
+      event: 'updateVal'
+    },
+    props: {
+      value: {
+        type: [String, Array],
+        default: ''
+      },
+      dataType: {
+        type: String,
+        default: 'String'
+      }
+    },
+    data() {
+      return {
+        deptTreeList: []
+      };
+    },
+    computed: {
+      ...mapGetters(['user']),
+      selectVal: {
+        set(val) {
+          switch (this.dataType) {
+            case 'Array':
+              this.$emit('updateVal', val);
+              break;
+            default:
+              this.$emit('updateVal', val.join(','));
+          }
+        },
+        get() {
+          switch (this.dataType) {
+            case 'Array':
+              return this.value || [];
+            default:
+              return this.value ? this.value.split(',') : [];
+          }
+        }
+      }
+    },
+    mounted() {
+      this.deptTreeList = this.$util.toTreeData({
+        data: this.user?.authorityDept?.groupList || [],
+        idField: 'id',
+        parentIdField: 'parentId'
+      });
+    }
+  };
+</script>
+
+<style scoped lang="scss"></style>

src/config/setting.js

@@ -24,7 +24,12 @@ export const REPEATABLE_TABS = [];
 export const WHITE_LIST = ['/login', '/forget'];
 
 // 开启 KeepAlive 后仍然不需要缓存的路由地址
-export const KEEP_ALIVE_EXCLUDES = [];
+export const KEEP_ALIVE_EXCLUDES = [
+  '/page-pro/project-initiation',
+  '/page-pro/planManage',
+  '/page-pro/task-manage',
+  '/page-pro/team-manage'
+];
 
 // 直接指定菜单数据
 export const USER_MENUS = undefined;

src/main.js

@@ -12,8 +12,9 @@ import i18n from './i18n';
 import './styles/index.scss';
 import DictSelection from '@/components/Dict/DictSelection';
 import HeaderTitle from '@/components/header-title';
+import authSelection from '@/components/authSelection';
 Vue.component('HeaderTitle', HeaderTitle);
-
+Vue.component('authSelection', authSelection);
 // // register globally
 import '@/icons';
 Vue.component('DictSelection', DictSelection);

src/store/modules/user.js

@@ -6,6 +6,7 @@ import { USER_MENUS } from '@/config/setting';
 import { getResourcesTree } from '@/api/layout';
 import { SYSTEM_NAME } from '@/config/setting';
 import Vue from 'vue';
+import { getCurrentUserAuthorityDeptAPI } from '@/api/login';
 const formatRouter = (list) => {
   let menuList = []; // menuType
   let authorities = [];
@@ -48,7 +49,9 @@ export default {
     // 当前登录用户的权限路由
     authoritiesRouter: [],
     // 当前登录用户的角色
-    roles: []
+    roles: [],
+    // 当前登录用户的数据权限部门数据
+    authorityDept: {}
   },
   mutations: {
     // 设置登录用户的信息
@@ -61,18 +64,26 @@ export default {
     },
     // 设置登录用户的权限
     setAuthorities(state, authorities) {
-      state.authorities = authorities.map(item=>item.permissionCode);
+      state.authorities = authorities.map((item) => item.permissionCode);
     },
     // 设置登录用户的权限路由
     setAuthoritiesRouter(state, authoritiesRouter) {
-      state.authoritiesRouter = authoritiesRouter
+      state.authoritiesRouter = authoritiesRouter;
     },
     // 设置登录用户的角色
     setRoles(state, roles) {
       state.roles = roles;
+    },
+    // 当前登录用户的数据权限部门数据
+    setAuthorityDept(state, info) {
+      state.authorityDept = info;
     }
   },
   actions: {
+    async getCurrentUserAuthorityDept({ commit }) {
+      const info = await getCurrentUserAuthorityDeptAPI();
+      commit('setAuthorityDept', info);
+    },
     /**
      * 请求用户信息、权限、角色、菜单
      */

src/views/contractManage/contractBook/components/inventoryTable.vue

@@ -111,7 +111,7 @@
           style="margin-bottom: 20px"
           :prop="'datasource.' + scope.$index + '.totalCount'"
           :rules="{
-            required: pageName == 'businessOpportunity' ? false : true,
+            required: false,
             pattern: numberReg,
             message: '请输入数字',
             trigger: 'blur'
@@ -129,7 +129,8 @@
         v-slot:headerTotalCount="{ column }"
         v-if="pageName != 'businessOpportunity'"
       >
-        <span class="is-required">{{ column.label }}</span>
+        <!-- class="is-required"       -->
+        <span>{{ column.label }}</span>
       </template>
       <template
         v-slot:headerSingleWeight="{ column }"
@@ -470,13 +471,14 @@
       <template v-slot:singleWeight="scope">
         <el-form-item
           style="margin-bottom: 20px"
-          :rules="{
-            required: pricingWay==2,
-            pattern: numberReg,
-            trigger: ['change','blur']
-          }"
-          :prop="'datasource.' + scope.$index + '.singleWeight'"
+
         >
+          <!--          :rules="{
+                      required: pricingWay==2,
+                      pattern: numberReg,
+                      trigger: ['change','blur']
+                    }"
+                    :prop="'datasource.' + scope.$index + '.singleWeight'"-->
           <el-input
             :disabled="isContractId"
             v-model="scope.row.singleWeight"
@@ -682,7 +684,7 @@ export default {
           prop: 'singleWeight',
           label: '单重',
           slot: 'singleWeight',
-          headerSlot: 'headerSingleWeight',
+          // headerSlot: 'headerSingleWeight',
           align: "center"
         },
         {
@@ -1002,15 +1004,16 @@ export default {
     getNumTotalPrice(sum = 0) {
       this.form.datasource.forEach((r, index) => {
         this.$set(r, 'discountSinglePrice', r.singlePrice ? Number(r.singlePrice) : '')
-        if (r.singlePrice && r.totalCount) {
+        if (r.singlePrice) {
+          //&& r.totalCount
           r.totalPrice = this.getAllPrice(r);
           r.discountTotalPrice = this.getDiscountTotalPrice(r);
           this.$set(this.form.datasource[index], 'totalPrice', Number(r.totalPrice))
           this.$set(this.form.datasource[index], 'discountTotalPrice', Number(r.discountTotalPrice))
           sum += Number(r.totalPrice);
         } else {
-          this.$set(r, 'totalPrice', '')
-          this.$set(r, 'discountTotalPrice', '')
+          this.$set(r, 'totalPrice', 0)
+          this.$set(r, 'discountTotalPrice', 0)
         }
       });
       return isNaN(sum) ? 0 : sum
@@ -1021,7 +1024,12 @@ export default {
     },
     //设置优惠总金额修改产品单价
     discountInputByOrder(val) {
-      this.form.discountTotalPrice = val
+      if (val > this.allPrice) {
+        this.form.discountTotalPrice = this.allPrice
+        this.$message.warning('优惠金额不能大于总计金额')
+      } else {
+        this.form.discountTotalPrice = val
+      }
       //获取优惠金额和总计的差价
       this.form.datasource.forEach((item) => {
         if (val === 0) {
@@ -1044,7 +1052,7 @@ export default {
     //获取折让单价
     getDiscountSinglePrice(row) {
       let num = Number(this.form.discountTotalPrice) / Number(this.allPrice) * Number(row.singlePrice)
-      return isNaN(num) ? '' : num
+      return isNaN(num) ? 0 : num
     },
     //获取合计
     getAllPrice(row) {
@@ -1064,13 +1072,13 @@ export default {
       let num = 0
       switch (this.pricingWay) {
         case 1: //按数量计价计算折让合计
-          num = Number(row.discountSinglePrice) * Number(row.totalCount)
+          num = Number(row.discountSinglePrice) * (Number(row.totalCount) || 0)
           break;
         case 2 ://按重量计价计算折让合计
-          num = Number(row.discountSinglePrice) * Number(row.totalCount) * Number(row.singleWeight)
+          num = Number(row.discountSinglePrice) * (Number(row.totalCount) || 0) * (Number(row.singleWeight) || 0)
           break;
       }
-      return isNaN(num) ? '' : num.toFixed(2)
+      return isNaN(num) ? 0 : num.toFixed(2)
     },
     //修改回显
     putTableValue(data) {

src/views/contractManage/contractBook/components/searchContract.vue

@@ -15,10 +15,6 @@
             v-model.trim="params.contractName"
           ></el-input>
         </el-form-item>
-        <el-form-item label="合同类型：" prop="type">
-          <DictSelection dictName="合同类型" clearable v-model="params.type">
-                </DictSelection>
-        </el-form-item>
 
       </el-col>
       <el-col v-bind="styleResponsive ? { lg:6, md: 12 } : { span:6 }">
@@ -27,32 +23,51 @@
           placeholder="请输入"
            v-model.trim="params.contractNo" controls-position="right" ></el-input>
         </el-form-item>
-        <el-form-item label="合同编号：" prop="contractNumber">
-          <el-input
-          placeholder="请输入"
-           v-model.trim="params.contractNumber" controls-position="right" ></el-input>
-        </el-form-item>
       </el-col>
-      <el-col v-bind="styleResponsive ? { lg:8, md: 12 } : { span:6 }">
+      <el-col v-bind="styleResponsive ? { lg:6, md: 12 } : { span:6 }">
 
         <el-form-item label="客户名称:" prop="contactName">
           <el-input
           placeholder="请输入"
-          style="max-width:180px"
            v-model.trim="params.contactName" controls-position="right" >
           </el-input>
 
         </el-form-item>
+      </el-col>
+
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="合同类型：" prop="type">
+          <DictSelection dictName="合同类型" clearable v-model="params.type">
+          </DictSelection>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row :gutter="15">
+
+      <el-col v-bind="styleResponsive ? { lg:6, md: 12 } : { span:6 }">
+        <el-form-item label="合同编号：" prop="contractNumber">
+          <el-input
+          placeholder="请输入"
+           v-model.trim="params.contractNumber" controls-position="right" ></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col v-bind="styleResponsive ? { lg:6, md: 12 } : { span:6 }">
+
         <el-form-item label="签订人:" prop="linkName">
           <el-input
           placeholder="请输入"
-          style="max-width:180px"
            v-model.trim="params.linkName" controls-position="right" >
           </el-input>
         </el-form-item>
       </el-col>
+      <el-col v-bind="styleResponsive ? { lg:6, md: 12 } : { span:6 }">
+
+        <el-form-item label="组织机构:">
+          <auth-selection v-model="params.deptIds" style="width: 100%"></auth-selection>
+        </el-form-item>
+      </el-col>
 
-      <el-col v-bind="styleResponsive ? { lg:4, md: 12 } : { span:4 }">
+      <el-col style="display: flex;justify-content: end" v-bind="styleResponsive ? { lg:6, md: 6 } : { span:6 }">
         <div class="ele-form-actions">
           <el-button
             type="primary"

src/views/contractManage/contractBook/index.vue

@@ -25,7 +25,7 @@
               ref="table"
               :columns="columns"
               :datasource="datasource"
-              height="calc(100vh - 350px)"
+              height="calc(100vh - 375px)"
               full-height="calc(100vh - 116px)"
               tool-class="ele-toolbar-form"
               :selection.sync="selection"
@@ -459,7 +459,7 @@ export default {
 }
 
 .sys-organization-list {
-  height: calc(100vh - 264px);
+  height: calc(100vh - 225px);
   box-sizing: border-box;
   border-width: 1px;
   border-style: solid;

src/views/financialManage/feeManage/feeApplication/page.vue

@@ -6,7 +6,7 @@
       ref="table"
       :columns="columns"
       :datasource="datasource"
-      height="calc(100vh - 420px)"
+      height="calc(100vh - 380px)"
       full-height="calc(100vh - 116px)"
       tool-class="ele-toolbar-form"
       :selection.sync="selection"

src/views/financialManage/feeManage/feeApplication/pageSearchTable.vue

@@ -30,6 +30,12 @@
           <dict-selection dict-name="单据类型" clearable v-model.trim="params.documentType"></dict-selection>
         </el-form-item>
       </el-col>
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="组织机构:">
+          <auth-selection v-model="params.deptIds" style="width: 100%"></auth-selection>
+        </el-form-item>
+      </el-col>
+
       <!--       <el-col v-bind="styleResponsive ? { lg:6, md: 12 } : { span:6 }">-->
       <!--        <el-form-item label="费用类型：" prop="feeTypeName">-->
       <!--          <el-input-->
@@ -54,7 +60,10 @@
       <!--        </el-form-item>-->
 
       <!--      </el-col>-->
-      <el-col v-bind="styleResponsive ? { lg:6, md: 12 } : { span:4 }">
+
+    </el-row>
+    <el-row :gutter="15">
+      <el-col style="display: flex;justify-content: end" v-bind="styleResponsive ? { lg:24, md: 24 } : { span:24 }">
 
         <div class="ele-form-actions">
           <el-button

src/views/financialManage/invoiceManage/components/searchTable.vue

@@ -34,6 +34,21 @@
           ></el-input>
         </el-form-item>
       </el-col>
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="会计科目：" prop="code">
+          <ele-tree-select
+            clearable
+            filterable
+            ref="treeSelect"
+            :data="accountingSubjectList"
+            v-model="params.accountingSubjectId"
+            valueKey="id"
+            labelKey="name"
+            placeholder="请选择"
+            default-expand-all
+          />
+        </el-form-item>
+      </el-col>
 <!--       <el-col v-bind="styleResponsive ? { lg:6, md: 12 } : { span:6 }">-->
 <!--        <el-form-item label="费用类型：" prop="feeTypeName">-->
 <!--          <el-input-->
@@ -61,18 +76,8 @@
     </el-row>
     <el-row :gutter="15">
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="会计科目：" prop="code">
-          <ele-tree-select
-            clearable
-            filterable
-            ref="treeSelect"
-            :data="accountingSubjectList"
-            v-model="params.accountingSubjectId"
-            valueKey="id"
-            labelKey="name"
-            placeholder="请选择"
-            default-expand-all
-          />
+        <el-form-item label="组织机构:">
+          <auth-selection data-type="Array" v-model="params.deptIds" style="width: 100%"></auth-selection>
         </el-form-item>
       </el-col>
       <!--       <el-col v-bind="styleResponsive ? { lg:6, md: 12 } : { span:6 }">-->
@@ -99,7 +104,7 @@
       <!--        </el-form-item>-->
 
       <!--      </el-col>-->
-      <el-col v-bind="styleResponsive ? { lg:6, md: 12 } : { span:4 }">
+      <el-col style="display: flex;justify-content: end" v-bind="styleResponsive ? { lg:18, md: 18 } : { span:18 }">
 
         <div class="ele-form-actions">
           <el-button

src/views/financialManage/invoiceManage/index.vue

@@ -7,7 +7,7 @@
         ref="table"
         :columns="columns"
         :datasource="datasource"
-        height="calc(100vh - 420px)"
+        height="calc(100vh - 375px)"
         full-height="calc(100vh - 116px)"
         tool-class="ele-toolbar-form"
         :selection.sync="selection"

src/views/financialManage/payableManage/index.vue

@@ -7,7 +7,7 @@
         ref="table"
         :columns="columns"
         :datasource="datasource"
-        height="calc(100vh - 420px)"
+        height="calc(100vh - 375px)"
         full-height="calc(100vh - 116px)"
         tool-class="ele-toolbar-form"
         :selection.sync="selection"

src/views/financialManage/payableManage/searchTable.vue

@@ -34,6 +34,21 @@
           ></el-input>
         </el-form-item>
       </el-col>
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="会计科目：" prop="code">
+          <ele-tree-select
+            clearable
+            filterable
+            ref="treeSelect"
+            :data="accountingSubjectList"
+            v-model="params.accountingSubjectId"
+            valueKey="id"
+            labelKey="name"
+            placeholder="请选择"
+            default-expand-all
+          />
+        </el-form-item>
+      </el-col>
       <!--       <el-col v-bind="styleResponsive ? { lg:6, md: 12 } : { span:6 }">-->
       <!--        <el-form-item label="费用类型：" prop="feeTypeName">-->
       <!--          <el-input-->
@@ -60,21 +75,7 @@
       <!--      </el-col>-->
     </el-row>
     <el-row :gutter="15">
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="会计科目：" prop="code">
-          <ele-tree-select
-            clearable
-            filterable
-            ref="treeSelect"
-            :data="accountingSubjectList"
-            v-model="params.accountingSubjectId"
-            valueKey="id"
-            labelKey="name"
-            placeholder="请选择"
-            default-expand-all
-          />
-        </el-form-item>
-      </el-col>
+
       <!--       <el-col v-bind="styleResponsive ? { lg:6, md: 12 } : { span:6 }">-->
       <!--        <el-form-item label="费用类型：" prop="feeTypeName">-->
       <!--          <el-input-->
@@ -99,7 +100,12 @@
       <!--        </el-form-item>-->
 
       <!--      </el-col>-->
-      <el-col v-bind="styleResponsive ? { lg:6, md: 12 } : { span:4 }">
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="组织机构:">
+          <auth-selection data-type="Array" v-model="params.deptIds" style="width: 100%"></auth-selection>
+        </el-form-item>
+      </el-col>
+      <el-col style="display: flex;justify-content: end" v-bind="styleResponsive ? { lg:18, md: 18 } : { span:18 }">
 
         <div class="ele-form-actions">
           <el-button

src/views/financialManage/receivableManage/index.vue

@@ -7,7 +7,7 @@
         ref="table"
         :columns="columns"
         :datasource="datasource"
-        height="calc(100vh - 420px)"
+        height="calc(100vh - 375px)"
         full-height="calc(100vh - 116px)"
         tool-class="ele-toolbar-form"
         :selection.sync="selection"

src/views/financialManage/receivableManage/searchTable.vue

@@ -34,6 +34,21 @@
           ></el-input>
         </el-form-item>
       </el-col>
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="会计科目：" prop="code">
+          <ele-tree-select
+            clearable
+            filterable
+            ref="treeSelect"
+            :data="accountingSubjectList"
+            v-model="params.accountingSubjectId"
+            valueKey="id"
+            labelKey="name"
+            placeholder="请选择"
+            default-expand-all
+          />
+        </el-form-item>
+      </el-col>
 <!--       <el-col v-bind="styleResponsive ? { lg:6, md: 12 } : { span:6 }">-->
 <!--        <el-form-item label="费用类型：" prop="feeTypeName">-->
 <!--          <el-input-->
@@ -60,21 +75,7 @@
 <!--      </el-col>-->
     </el-row>
     <el-row :gutter="15">
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="会计科目：" prop="code">
-                      <ele-tree-select
-                        clearable
-                        filterable
-                        ref="treeSelect"
-                        :data="accountingSubjectList"
-                        v-model="params.accountingSubjectId"
-                        valueKey="id"
-                        labelKey="name"
-                        placeholder="请选择"
-                        default-expand-all
-                      />
-        </el-form-item>
-      </el-col>
+
 <!--       <el-col v-bind="styleResponsive ? { lg:6, md: 12 } : { span:6 }">-->
 <!--        <el-form-item label="费用类型：" prop="feeTypeName">-->
 <!--          <el-input-->
@@ -99,7 +100,12 @@
 <!--        </el-form-item>-->
 
 <!--      </el-col>-->
-      <el-col v-bind="styleResponsive ? { lg:6, md: 12 } : { span:4 }">
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="组织机构:">
+          <auth-selection data-type="Array" v-model="params.deptIds" style="width: 100%"></auth-selection>
+        </el-form-item>
+      </el-col>
+      <el-col style="display: flex;justify-content: end" v-bind="styleResponsive ? { lg:18, md: 18 } : { span:18 }">
 
         <div class="ele-form-actions">
           <el-button

src/views/financialManage/settlementAccount/components/searchTable.vue

@@ -49,7 +49,12 @@
 <!--        </el-form-item>-->
 
 <!--      </el-col>-->
-      <el-col v-bind="styleResponsive ? { lg:6, md: 12 } : { span:4 }">
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="组织机构:">
+          <auth-selection data-type="Array" v-model="params.deptIds" style="width: 100%"></auth-selection>
+        </el-form-item>
+      </el-col>
+      <el-col style="display: flex;justify-content: end" v-bind="styleResponsive ? { lg:6, md: 6 } : { span:6 }">
 
         <div class="ele-form-actions">
           <el-button

src/views/financialManage/settlementAccount/index.vue

@@ -7,7 +7,7 @@
         ref="table"
         :columns="columns"
         :datasource="datasource"
-        height="calc(100vh - 420px)"
+        height="calc(100vh - 325px)"
         full-height="calc(100vh - 116px)"
         tool-class="ele-toolbar-form"
         :selection.sync="selection"

src/views/login/index.vue

@@ -180,6 +180,7 @@
               this.$store.commit('user/setUserInfo', res.data);
               this.loading = false;
               this.$message.success(res.message);
+              this.$store.dispatch('user/getCurrentUserAuthorityDept');
               this.goHome();
             })
             .catch((e) => {

src/views/purchasingManage/inquiryManage/components/searchIndex.vue

@@ -1,7 +1,7 @@
 <!-- 搜索表单 -->
 <template>
   <el-form
-    label-width="130px"
+    label-width="100px"
     class="ele-form-search"
     @keyup.enter.native="search"
     @submit.native.prevent
@@ -53,10 +53,10 @@
       </el-col> -->
     </el-row>
     <el-row :gutter="15">
-      <el-col v-bind="styleResponsive ? { lg: 10, md: 12 } : { span: 6 }">
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="创建时间：" prop="createTimeStart">
           <el-date-picker
-            style="width: 360px"
+            style="width: 100%"
             v-model="createTime"
             @change="changeCreateTime"
             type="datetimerange"
@@ -68,7 +68,12 @@
           </el-date-picker>
         </el-form-item>
       </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 4, md: 12 } : { span: 4 }">
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="组织机构:">
+          <auth-selection v-model="params.deptIds" style="width: 100%"></auth-selection>
+        </el-form-item>
+      </el-col>
+      <el-col style="display: flex;justify-content: end" v-bind="styleResponsive ? { lg: 12, md: 12 } : { span: 12 }">
         <div class="ele-form-actions">
           <el-button
             type="primary"

src/views/purchasingManage/inquiryManage/index.vue

@@ -9,7 +9,7 @@
           ref="table"
           :columns="columns"
           :datasource="datasource"
-          height="calc(100vh - 350px)"
+          height="calc(100vh - 325px)"
           full-height="calc(100vh - 116px)"
           tool-class="ele-toolbar-form"
           :selection.sync="selection"

src/views/purchasingManage/purchaseNeedManage/components/searchQuotation.vue

@@ -1,14 +1,14 @@
 <!-- 搜索表单 -->
 <template>
   <el-form
-    label-width="130px"
+    label-width="100px"
     class="ele-form-search"
     @keyup.enter.native="search"
     @submit.native.prevent
   >
     <el-row :gutter="15">
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="需求来源类型：" prop="sourceCode">
+        <el-form-item label="需求来源：" prop="sourceCode">
           <DictSelection
             dictName="需求来源类型"
             clearable
@@ -20,7 +20,7 @@
       </el-col>
 
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="需求部门名称：" prop="requireDeptName">
+        <el-form-item label="需求部门：" prop="requireDeptName">
           <el-input
             clearable
             placeholder="请输入"
@@ -28,11 +28,12 @@
           ></el-input>
         </el-form-item>
       </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 8, md: 12 } : { span: 6 }">
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="完成日期:" prop="finishDateStart">
           <el-date-picker
             v-model="finishDate"
             @change="changeCreateTime"
+            style="width: 100%"
             type="daterange"
             value-format="yyyy-MM-dd"
             start-placeholder="开始日期"
@@ -41,13 +42,11 @@
           </el-date-picker>
         </el-form-item>
       </el-col>
-    </el-row>
-    <el-row :gutter="15">
-      <el-col v-bind="styleResponsive ? { lg: 10, md: 12 } : { span: 6 }">
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="创建时间:" prop="createTimeStart">
           <el-date-picker
             v-model="createTime"
-            style="width: 360px"
+            style="width: 100%"
 
             @change="changeDate"
             type="datetimerange"
@@ -59,7 +58,14 @@
           </el-date-picker>
         </el-form-item>
       </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 4, md: 12 } : { span: 4 }">
+    </el-row>
+    <el-row :gutter="15">
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="组织机构:">
+          <auth-selection v-model="params.deptIds" style="width: 100%"></auth-selection>
+        </el-form-item>
+      </el-col>
+      <el-col style="display: flex;justify-content: end" v-bind="styleResponsive ? { lg: 18, md: 18 } : { span: 18 }">
         <div class="ele-form-actions">
           <el-button
             type="primary"

src/views/purchasingManage/purchaseNeedManage/index.vue

@@ -9,7 +9,7 @@
           ref="table"
           :columns="columns"
           :datasource="datasource"
-          height="calc(100vh - 350px)"
+          height="calc(100vh - 375px)"
           full-height="calc(100vh - 116px)"
           tool-class="ele-toolbar-form"
           :selection.sync="selection"

src/views/purchasingManage/purchaseOrder/accountstatement/components/searchTable.vue

@@ -15,43 +15,54 @@
             v-model.trim="params.statementNo"
           ></el-input>
         </el-form-item>
-        <el-form-item label="创建时间:" prop="createTimeStart">
-          <el-date-picker
-      v-model="createTime"
-      @change="changeDate"
-      type="daterange"
-      style="width:292px"
-      value-format="yyyy-MM-dd"
-      start-placeholder="开始时间"
-      end-placeholder="结束时间"
-      :default-time="['00:00:00', '23:59:59']">
-    </el-date-picker>
-        </el-form-item>
       </el-col>
-       <el-col v-bind="styleResponsive ? { lg:6, md: 12 } : { span:6 }">
+      <el-col v-bind="styleResponsive ? { lg:6, md: 12 } : { span:6 }">
         <el-form-item label="项目名称：" prop="projectName">
           <el-input
-          placeholder="请输入"
-          style="max-width:320px"
-           v-model.trim="params.projectName" controls-position="right" >
+            placeholder="请输入"
+            style="max-width:320px"
+            v-model.trim="params.projectName" controls-position="right">
           </el-input>
-         
+
         </el-form-item>
-      </el-col>  
+      </el-col>
       <el-col v-bind="styleResponsive ? { lg:6, md: 12 } : { span:6 }">
-       
+
         <el-form-item label="供应商名称：" prop="contactName">
           <el-input
-          placeholder="请输入"
-          style="max-width:320px"
-           v-model.trim="params.contactName" controls-position="right" >
+            placeholder="请输入"
+            style="max-width:320px"
+            v-model.trim="params.contactName" controls-position="right">
           </el-input>
-         
+
         </el-form-item>
-       
-      </el-col> 
-      <el-col v-bind="styleResponsive ? { lg:6, md: 12 } : { span:4 }">
-      
+
+      </el-col>
+      <el-col v-bind="styleResponsive ? { lg:6, md: 12 } : { span:6 }">
+
+        <el-form-item label="创建时间:" prop="createTimeStart">
+          <el-date-picker
+            v-model="createTime"
+            @change="changeDate"
+            type="daterange"
+            style="width:100%"
+            value-format="yyyy-MM-dd"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
+            :default-time="['00:00:00', '23:59:59']">
+          </el-date-picker>
+        </el-form-item>
+      </el-col>
+
+    </el-row>
+    <el-row :gutter="15">
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="组织机构:">
+          <auth-selection data-type="Array" v-model="params.deptIds" style="width: 100%"></auth-selection>
+        </el-form-item>
+      </el-col>
+      <el-col style="display: flex;justify-content: end" v-bind="styleResponsive ? { lg:18, md: 18 } : { span:18 }">
+
         <div class="ele-form-actions">
           <el-button
             type="primary"
@@ -69,55 +80,56 @@
 </template>
 <script>
 import {reviewStatusEnum} from '@/enum/dict';
-const repliedOptions=[
-  {value:0,label:'否'},
-  {value:1,label:'是'},
+
+const repliedOptions = [
+  {value: 0, label: '否'},
+  {value: 1, label: '是'},
 ]
-  export default {
-    data () {
-      // 默认表单数据
-      const defaultParams = {
-        contactName: '',
-        statementNo:'',
-        projectId:'',
-        projectName:'',
-        createTimeEnd:'',
-        createTimeStart:''
-      };
-      return {
-        reviewStatusEnum,
-        defaultParams,
-        repliedOptions,
-        createTime:[],
-        // 表单数据
-        params: { ...defaultParams }
-      };
+export default {
+  data() {
+    // 默认表单数据
+    const defaultParams = {
+      contactName: '',
+      statementNo: '',
+      projectId: '',
+      projectName: '',
+      createTimeEnd: '',
+      createTimeStart: ''
+    };
+    return {
+      reviewStatusEnum,
+      defaultParams,
+      repliedOptions,
+      createTime: [],
+      // 表单数据
+      params: {...defaultParams}
+    };
+  },
+  computed: {
+    // 是否开启响应式布局
+    styleResponsive() {
+      return this.$store.state.theme.styleResponsive;
+    }
+  },
+  methods: {
+    //选择时间
+    changeDate(e) {
+      this.createTime = e
     },
-    computed: {
-      // 是否开启响应式布局
-      styleResponsive () {
-        return this.$store.state.theme.styleResponsive;
-      }
+    /* 搜索 */
+    search() {
+      let [createTimeStart, createTimeEnd] = this.createTime
+      this.params = Object.assign({}, this.params, {createTimeStart, createTimeEnd})
+      this.$emit('search', {
+        ...this.params
+      });
     },
-    methods: {
-      //选择时间
-      changeDate(e){
-       this.createTime=e
-      },
-      /* 搜索 */
-      search () {
-        let [createTimeStart,createTimeEnd]=this.createTime
-        this.params=Object.assign({},this.params,{createTimeStart,createTimeEnd})
-        this.$emit('search', {
-          ...this.params
-        });
-      },
-      /*  重置 */
-      reset () {
-        this.createTime=[]
-        this.params = Object.assign({},{ ...this.defaultParams });
-        this.search();
-      }
+    /*  重置 */
+    reset() {
+      this.createTime = []
+      this.params = Object.assign({}, {...this.defaultParams});
+      this.search();
     }
-  };
+  }
+};
 </script>

src/views/purchasingManage/purchaseOrder/accountstatement/index.vue

@@ -9,7 +9,8 @@
           ref="table"
           :columns="columns"
           :datasource="datasource"
-          height="calc(100vh - 385px)"
+          height="calc(100vh - 405px)"
+          style="margin-bottom: 10px"
           full-height="calc(100vh - 116px)"
           tool-class="ele-toolbar-form"
           :selection.sync="selection"

src/views/purchasingManage/purchaseOrder/components/inventoryTable.vue

@@ -65,14 +65,14 @@
         <template v-slot:totalCount="scope">
           <el-form-item
             style="margin-bottom: 20px"
-            :prop="'datasource.' + scope.$index + '.totalCount'"
+          >
+<!--  :prop="'datasource.' + scope.$index + '.totalCount'"
             :rules="{
               required: true,
               pattern: numberReg,
               message: '请输入数字',
               trigger: 'blur'
-            }"
-          >
+            }"           -->
             <el-input
               :disabled="isContractId"
               v-model="scope.row.totalCount"
@@ -343,11 +343,11 @@
           <span class="is-required">{{ column.label }}</span>
         </template>
         <!-- 操作列 -->
-        <template v-slot:action="{ row }">
+        <template v-slot:action="{ row,$index }">
           <el-popconfirm
             class="ele-action"
             title="确定要删除吗？"
-            @confirm="remove(row)"
+            @confirm="remove(row,$index)"
           >
             <template v-slot:reference>
               <el-link type="danger" :underline="false" icon="el-icon-delete">
@@ -489,7 +489,7 @@ export default {
           prop: 'totalCount',
           label: '数量',
           slot: 'totalCount',
-          headerSlot: 'headerTotalCount',
+          // headerSlot: 'headerTotalCount',
           align: "center"
 
         },
@@ -812,12 +812,13 @@ export default {
       this.$set(this.form.datasource[idx], 'specification', obj.specification);
       this.$set(this.form.datasource[idx], 'weightUnit', obj.weightUnit);
     },
-    remove(row) {
-      let index = this.form.datasource.findIndex((n) => n.key == row.key);
-      if (index !== -1) {
-        this.form.datasource.splice(index, 1);
-        this.setSort();
-      }
+    remove(row,index) {
+      this.form.datasource.splice(index, 1);
+      // let index = this.form.datasource.findIndex((n) => n.key == row.key);
+      // if (index !== -1) {
+      //   this.form.datasource.splice(index, 1);
+      //   this.setSort();
+      // }
     },
     // 清空表格
     restTable() {

src/views/purchasingManage/purchaseOrder/components/searchTable.vue

@@ -17,18 +17,7 @@
 
         </el-form-item>
 
-        <el-form-item label="创建时间：" prop="createTimeStart">
-          <el-date-picker
-            v-model="createTime"
-            @change="changeDate"
-            type="datetimerange"
-            style="width:320px"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            start-placeholder="开始时间"
-            end-placeholder="结束时间"
-            :default-time="['00:00:00', '23:59:59']">
-          </el-date-picker>
-        </el-form-item>
+
       </el-col>
       <!-- <el-col v-bind="styleResponsive ? { lg:6, md: 12 } : { span:6 }">
         <el-form-item label="发货状态：" prop="deliveryStatus">
@@ -73,7 +62,30 @@
           ></el-input>
         </el-form-item>
       </el-col>
-      <el-col v-bind="styleResponsive ? { lg:6, md: 12 } : { span:4 }">
+      <el-col v-bind="styleResponsive ? { lg:6, md: 12 } : { span:6 }">
+
+        <el-form-item label="创建时间：" prop="createTimeStart">
+          <el-date-picker
+            v-model="createTime"
+            @change="changeDate"
+            type="datetimerange"
+            style="width:100%"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
+            :default-time="['00:00:00', '23:59:59']">
+          </el-date-picker>
+        </el-form-item>
+      </el-col>
+
+    </el-row>
+    <el-row :gutter="15">
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="组织机构:">
+          <auth-selection v-model="params.deptIds" style="width: 100%"></auth-selection>
+        </el-form-item>
+      </el-col>
+      <el-col style="display: flex;justify-content: end" v-bind="styleResponsive ? { lg:18, md: 18 } : { span:18 }">
 
         <div class="ele-form-actions">
           <el-button

src/views/purchasingManage/purchaseOrder/index.vue

@@ -15,7 +15,7 @@
           </ul>
         </div>
       </div>
-      <div class="main">
+      <div class="main" style="padding: 0 10px">
         <div v-if="activeComp == 'saleorder'">
           <div class="ele-border-lighter form-content" v-loading="loading">
             <search-table @search="reload"></search-table>
@@ -25,7 +25,8 @@
               ref="table"
               :columns="columns"
               :datasource="datasource"
-              height="calc(100vh - 385px)"
+              height="calc(100vh - 405px)"
+              style="margin-bottom: 10px"
               full-height="calc(100vh - 116px)"
               tool-class="ele-toolbar-form"
               :selection.sync="selection"

src/views/purchasingManage/purchaseOrder/invoice/components/searchTable.vue

@@ -15,13 +15,7 @@
             v-model.trim="params.receiveNo"
           ></el-input>
         </el-form-item>
-        <el-form-item label="订单编码：" prop="orderNo">
-          <el-input
-            clearable
-            placeholder="请输入"
-            v-model.trim="params.orderNo"
-          ></el-input>
-        </el-form-item>
+
       </el-col>
        <el-col v-bind="styleResponsive ? { lg:6, md: 12 } : { span:6 }">
         <el-form-item label="是否回执：" prop="replied">
@@ -57,7 +51,25 @@
         </el-form-item>
 
       </el-col>
-      <el-col v-bind="styleResponsive ? { lg:6, md: 12 } : { span:4 }">
+
+      <el-col v-bind="styleResponsive ? { lg:6, md: 12 } : { span:6 }">
+
+        <el-form-item label="订单编码：" prop="orderNo">
+          <el-input
+            clearable
+            placeholder="请输入"
+            v-model.trim="params.orderNo"
+          ></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row :gutter="15">
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="组织机构:">
+          <auth-selection v-model="params.deptIds" style="width: 100%"></auth-selection>
+        </el-form-item>
+      </el-col>
+      <el-col style="display: flex;justify-content: end" v-bind="styleResponsive ? { lg:18, md: 18 } : { span:18 }">
 
         <div class="ele-form-actions">
           <el-button

src/views/purchasingManage/purchaseOrder/invoice/index.vue

@@ -9,7 +9,8 @@
           ref="table"
           :columns="columns"
           :datasource="datasource"
-          height="calc(100vh - 385px)"
+          height="calc(100vh - 405px)"
+          style="margin-bottom: 10px"
           full-height="calc(100vh - 116px)"
           tool-class="ele-toolbar-form"
           :selection.sync="selection"

src/views/purchasingManage/purchaseOrder/outSourceSend/components/searchTable.vue

@@ -37,7 +37,15 @@
         </el-form-item>
 
       </el-col>
-      <el-col v-bind="styleResponsive ? { lg:6, md: 12 } : { span:4 }">
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="组织机构:">
+          <auth-selection v-model="params.deptIds" style="width: 100%"></auth-selection>
+        </el-form-item>
+      </el-col>
+
+    </el-row>
+    <el-row>
+      <el-col style="display: flex;justify-content: end" v-bind="styleResponsive ? { lg:24, md: 24 } : { span:24 }">
 
         <div class="ele-form-actions">
           <el-button

src/views/purchasingManage/purchaseOrder/outSourceSend/index.vue

@@ -9,7 +9,8 @@
           ref="table"
           :columns="columns"
           :datasource="datasource"
-          height="calc(100vh - 385px)"
+          height="calc(100vh - 355px)"
+          style="margin-bottom: 10px"
           full-height="calc(100vh - 116px)"
           tool-class="ele-toolbar-form"
           :selection.sync="selection"

src/views/purchasingManage/purchaseOrder/returnGoods/components/searchTable.vue

@@ -15,22 +15,42 @@
             v-model.trim="params.returnNo"
           ></el-input>
         </el-form-item>
-        <el-form-item label="订单编码：" prop="orderNo">
+
+      </el-col>
+      <el-col v-bind="styleResponsive ? { lg:6, md: 12 } : { span:6 }">
+        <el-form-item label="收货单编码：" prop="receiveNo">
           <el-input
             clearable
             placeholder="请输入"
-            v-model.trim="params.orderNo"
+            v-model.trim="params.receiveNo"
           ></el-input>
         </el-form-item>
+
       </el-col>
-       <el-col v-bind="styleResponsive ? { lg:6, md: 12 } : { span:6 }">
-        <el-form-item label="收货单编码：" prop="receiveNo">
+      <el-col v-bind="styleResponsive ? { lg:6, md: 12 } : { span:6 }">
+        <el-form-item label="订单编码：" prop="orderNo">
           <el-input
             clearable
             placeholder="请输入"
-            v-model.trim="params.receiveNo"
+            v-model.trim="params.orderNo"
           ></el-input>
         </el-form-item>
+      </el-col>
+      <el-col v-bind="styleResponsive ? { lg:6, md: 12 } : { span:6 }">
+
+        <el-form-item label="供应商名称：" prop="supplierName">
+          <el-input
+            placeholder="请输入"
+            style="max-width:320px"
+            v-model.trim="params.supplierName" controls-position="right">
+          </el-input>
+        </el-form-item>
+      </el-col>
+
+    </el-row>
+    <el-row :gutter="15">
+      <el-col v-bind="styleResponsive ? { lg:6, md: 12 } : { span:6 }">
+
         <el-form-item label="审核状态：" prop="reviewStatus">
           <el-select v-model="params.reviewStatus" placeholder="请选择" class="w100" clearable>
             <el-option
@@ -41,21 +61,14 @@
             ></el-option>
           </el-select>
         </el-form-item>
-      </el-col>  
-      <el-col v-bind="styleResponsive ? { lg:6, md: 12 } : { span:6 }">
-       
-        <el-form-item label="供应商名称：" prop="supplierName">
-          <el-input
-          placeholder="请输入"
-          style="max-width:320px"
-           v-model.trim="params.supplierName" controls-position="right" >
-          </el-input>
-         
+      </el-col>
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="组织机构:">
+          <auth-selection v-model="params.deptIds" style="width: 100%"></auth-selection>
         </el-form-item>
-        
-      </el-col> 
-      <el-col v-bind="styleResponsive ? { lg:6, md: 12 } : { span:4 }">
-      
+      </el-col>
+      <el-col style="display: flex;justify-content: end" v-bind="styleResponsive ? { lg:12, md: 12 } : { span:12 }">
+
         <div class="ele-form-actions">
           <el-button
             type="primary"
@@ -68,57 +81,59 @@
           <el-button @click="reset">重置</el-button>
         </div>
       </el-col>
+
     </el-row>
   </el-form>
 </template>
 <script>
 import {reviewStatusEnum} from '@/enum/dict';
-const repliedOptions=[
-  {value:0,label:'否'},
-  {value:1,label:'是'},
+
+const repliedOptions = [
+  {value: 0, label: '否'},
+  {value: 1, label: '是'},
 ]
-  export default {
-    data () {
-      // 默认表单数据
-      const defaultParams = {
-        supplierName: '',
-        contractId:'',
-        docNo:'',
-        orderId:'',
-        replied:null,
-        reviewStatus:null
-      };
-      return {
-        reviewStatusEnum,
-        defaultParams,
-        repliedOptions,
-        // 表单数据
-        params: { ...defaultParams }
-      };
+export default {
+  data() {
+    // 默认表单数据
+    const defaultParams = {
+      supplierName: '',
+      contractId: '',
+      docNo: '',
+      orderId: '',
+      replied: null,
+      reviewStatus: null
+    };
+    return {
+      reviewStatusEnum,
+      defaultParams,
+      repliedOptions,
+      // 表单数据
+      params: {...defaultParams}
+    };
+  },
+  computed: {
+    // 是否开启响应式布局
+    styleResponsive() {
+      return this.$store.state.theme.styleResponsive;
+    }
+  },
+  methods: {
+    //选择时间
+    changeDate(e) {
+      this.createTime = e
     },
-    computed: {
-      // 是否开启响应式布局
-      styleResponsive () {
-        return this.$store.state.theme.styleResponsive;
-      }
+    /* 搜索 */
+    search() {
+      this.$emit('search', {
+        ...this.params
+      });
     },
-    methods: {
-      //选择时间
-      changeDate(e){
-       this.createTime=e
-      },
-      /* 搜索 */
-      search () {
-        this.$emit('search', {
-          ...this.params
-        });
-      },
-      /*  重置 */
-      reset () {
-        this.createTime=[]
-        this.params = Object.assign({},{ ...this.defaultParams });
-        this.search();
-      }
+    /*  重置 */
+    reset() {
+      this.createTime = []
+      this.params = Object.assign({}, {...this.defaultParams});
+      this.search();
     }
-  };
+  }
+};
 </script>

src/views/purchasingManage/purchaseOrder/returnGoods/index.vue

@@ -9,7 +9,8 @@
           ref="table"
           :columns="columns"
           :datasource="datasource"
-          height="calc(100vh - 385px)"
+          height="calc(100vh - 405px)"
+          style="margin-bottom: 10px"
           full-height="calc(100vh - 116px)"
           tool-class="ele-toolbar-form"
           :selection.sync="selection"
@@ -22,8 +23,7 @@
               type="primary"
               icon="el-icon-plus"
               class="ele-btn-icon"
-              @click="openEdit('add', {})"
-            >
+              @click="openEdit('add', {})">
               新建
             </el-button>
 
@@ -33,8 +33,7 @@
               el-icon-delete
               class="ele-btn-icon"
               @click="allDelBtn"
-              :disabled="selection?.length === 0"
-            >
+              :disabled="selection?.length === 0">
               批量删除
             </el-button>
           </template>
@@ -45,10 +44,8 @@
             <el-link
               type="primary"
               :underline="false"
-              @click="openorderDetail(row, 'returnNo')"
-            >
-              {{ row.returnNo }}</el-link
-            >
+              @click="openorderDetail(row, 'returnNo')">
+              {{ row.returnNo }}</el-link>
           </template>
           <template v-slot:receiveNo="{ row }">
             <el-link

src/views/purchasingManage/purchasePlanManage/components/searchQuotation.vue

@@ -1,7 +1,7 @@
 <!-- 搜索表单 -->
 <template>
   <el-form
-    label-width="130px"
+    label-width="100px"
     class="ele-form-search"
     @keyup.enter.native="search"
     @submit.native.prevent
@@ -30,7 +30,7 @@
       </el-col> -->
 
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="需求部门名称：" prop="requireDeptName">
+        <el-form-item label="需求部门：" prop="requireDeptName">
           <el-input
             clearable
             placeholder="请输入"
@@ -38,11 +38,21 @@
           ></el-input>
         </el-form-item>
       </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 8, md: 12 } : { span: 6 }">
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="需求名称：" prop="requirementName">
+          <el-input
+            clearable
+            placeholder="请输入"
+            v-model.trim="params.requirementName"
+          ></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="完成日期:" prop="finishDateStart">
           <el-date-picker
             v-model="finishDate"
             @change="changeDate"
+            style="width: 100%"
             type="daterange"
             value-format="yyyy-MM-dd"
             start-placeholder="开始日期"
@@ -53,10 +63,11 @@
       </el-col>
     </el-row>
     <el-row :gutter="15">
-      <el-col v-bind="styleResponsive ? { lg: 10, md: 12 } : { span: 6 }">
+
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="创建时间:" prop="createTimeStart">
           <el-date-picker
-            style="width: 360px"
+            style="width: 100%"
             v-model="createTime"
             @change="changeCreateTime"
             type="datetimerange"
@@ -68,7 +79,12 @@
           </el-date-picker>
         </el-form-item>
       </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 4, md: 12 } : { span: 4 }">
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="组织机构:">
+          <auth-selection v-model="params.deptIds" style="width: 100%"></auth-selection>
+        </el-form-item>
+      </el-col>
+      <el-col style="display: flex;justify-content: end" v-bind="styleResponsive ? { lg: 12, md: 12 } : { span: 12 }">
         <div class="ele-form-actions">
           <el-button
             type="primary"
@@ -94,6 +110,7 @@
         createTimeStart: '',
         createTimeEnd: '',
         sourceTypeName: '',
+        requirementName: '',
         sourceType: ''
       };
       return {

src/views/purchasingManage/purchasePlanManage/index.vue

@@ -9,7 +9,7 @@
           ref="table"
           :columns="columns"
           :datasource="datasource"
-          height="calc(100vh - 350px)"
+          height="calc(100vh - 375px)"
           full-height="calc(100vh - 116px)"
           tool-class="ele-toolbar-form"
           :selection.sync="selection"

src/views/purchasingManage/supplierManage/components/addContactDialog.vue

@@ -64,7 +64,7 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="地址" prop="addressId">
-                <el-cascader clearable v-model="form.addressId" :options="options.cityData" ref="address"
+                <el-cascader clearable v-model="form.addressId" filterable :options="options.cityData" ref="address"
                              style="width: 100%"></el-cascader>
               </el-form-item>
             </el-col>

src/views/purchasingManage/supplierManage/components/contactSearch.vue

@@ -38,7 +38,7 @@
           </el-select>
         </el-form-item>
       </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+      <el-col style="display: flex;justify-content: end" v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <div class="ele-form-actions">
           <el-button
             type="primary"

src/views/purchasingManage/supplierManage/index.vue

@@ -26,7 +26,7 @@
               ref="table"
               :columns="columns"
               :datasource="datasource"
-              height="calc(100vh - 300px)"
+              height="calc(100vh - 325px)"
               full-height="calc(100vh - 116px)"
               tool-class="ele-toolbar-form"
               :selection.sync="selection"
@@ -400,7 +400,7 @@
   }
 
   .sys-organization-list {
-    height: calc(100vh - 264px);
+    height: calc(100vh - 225px);
     box-sizing: border-box;
     border-width: 1px;
     border-style: solid;

src/views/saleManage/businessOpportunity/components/opportunitySearch.vue

@@ -7,7 +7,7 @@
     @submit.native.prevent
   >
     <el-row :gutter="15">
-      <el-col v-bind="styleResponsive ? { lg: 4, md: 12 } : { span: 6 }">
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="客户名称：" prop="contactName">
           <el-input
             clearable
@@ -16,7 +16,7 @@
           ></el-input>
         </el-form-item>
       </el-col>
-      <el-col v-bind="styleResponsive ? { lg:4, md: 12 } : { span:6 }">
+      <el-col v-bind="styleResponsive ? { lg:6, md: 12 } : { span:6 }">
         <el-form-item label="商机名称：" prop="name">
           <el-input
             clearable
@@ -24,21 +24,27 @@
             v-model.trim="params.name"
           ></el-input>
         </el-form-item>
-      </el-col> 
-      <el-col v-bind="styleResponsive ? { lg: 12, md: 12 } : { span: 6 }">
+      </el-col>
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="创建时间:" prop="createTimeStart">
           <el-date-picker
-      v-model="createTime"
-      @change="changeDate"
-      type="datetimerange"
-      value-format="yyyy-MM-dd HH:mm:ss"
-      start-placeholder="开始时间"
-      end-placeholder="结束时间"
-      :default-time="['00:00:00', '23:59:59']">
-    </el-date-picker>
+            style="width: 100%"
+            v-model="createTime"
+            @change="changeDate"
+            type="datetimerange"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
+            :default-time="['00:00:00', '23:59:59']">
+          </el-date-picker>
+        </el-form-item>
+      </el-col>
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="组织机构:">
+          <auth-selection v-model="params.deptIds" style="width: 100%"></auth-selection>
         </el-form-item>
       </el-col>
-      <el-col v-bind="styleResponsive ? { lg:4, md: 12 } : { span:4 }">
+      <el-col style="display: flex;justify-content: end"  v-bind="styleResponsive ? { lg:24, md: 24 } : { span:24 }">
         <div class="ele-form-actions">
           <el-button
             type="primary"
@@ -55,52 +61,52 @@
   </el-form>
 </template>
 <script>
-  export default {
-    data () {
-      // 默认表单数据
-      const defaultParams = {
-        type: 1,
-        name: '',
-        codeOrSerialNo: '',
-        status: ''
-      };
-      return {
-        createTime:[],
-        where:{createTimeStart:'',createTimeEnd:''},
-        defaultParams,
-        // 表单数据
-        params: { ...defaultParams },
-        // 状态数据源
-        statusList: [
-          {value: 1, label: "有效"},
-          {value: 2, label: "失效"}
-        ],
-      };
+export default {
+  data() {
+    // 默认表单数据
+    const defaultParams = {
+      type: 1,
+      name: '',
+      codeOrSerialNo: '',
+      status: '',
+      deptIds:''
+    };
+    return {
+      createTime: [],
+      where: {createTimeStart: '', createTimeEnd: ''},
+      defaultParams,
+      // 表单数据
+      params: {...defaultParams},
+      // 状态数据源
+      statusList: [
+        {value: 1, label: "有效"},
+        {value: 2, label: "失效"}
+      ],
+    };
+  },
+  computed: {
+    // 是否开启响应式布局
+    styleResponsive() {
+      return this.$store.state.theme.styleResponsive;
+    }
+  },
+  methods: {
+    changeDate(e) {
+      this.createTime = e
     },
-    computed: {
-      // 是否开启响应式布局
-      styleResponsive () {
-        return this.$store.state.theme.styleResponsive;
-      }
+    /* 搜索 */
+    search() {
+      const [createTimeStart, createTimeEnd] = this.createTime
+      this.params = Object.assign({}, this.params, {createTimeStart, createTimeEnd})
+      this.$emit('search', {
+        ...this.params
+      });
     },
-    methods: {
-      changeDate(e){
-       this.createTime=e
-      },
-      /* 搜索 */
-      search () {
-        console.log(this.current);
-        const [createTimeStart,createTimeEnd]=this.createTime
-        this.params=Object.assign({},this.params,{createTimeStart,createTimeEnd})
-        this.$emit('search', {
-          ...this.params
-        });
-      },
-      /*  重置 */
-      reset () {
-        this.params = { ...this.defaultParams };
-        this.search();
-      }
+    /*  重置 */
+    reset() {
+      this.params = {...this.defaultParams};
+      this.search();
     }
-  };
+  }
+};
 </script>

src/views/saleManage/businessOpportunity/index.vue

@@ -9,7 +9,7 @@
           ref="table"
           :columns="columns"
           :datasource="datasource"
-          height="calc(100vh - 300px)"
+          height="calc(100vh - 325px)"
           full-height="calc(100vh - 116px)"
           tool-class="ele-toolbar-form"
           :selection.sync="selection"

src/views/saleManage/contact/components/assignDialog.vue

@@ -17,11 +17,11 @@
       :rules="rules"
       style="margin-top: 30px"
     >
-      <el-form-item label="分管部门" prop="deptId" style="margin-bottom: 22px">
+      <el-form-item label="分管部门" prop="fgDeptId" style="margin-bottom: 22px">
         <ele-tree-select
           clearable
           :data="groupTreeData"
-          v-model="form.deptId"
+          v-model="form.fgDeptId"
           valueKey="id"
           labelKey="name"
           placeholder="请选择"
@@ -58,8 +58,8 @@
   let formDef = {
     contactIds: [],
     contactNames: [],
-    deptId: '',
-    deptName: '',
+    fgDeptId: '',
+    fgDeptName: '',
     salesmanId: '',
     salesmanName: ''
   };
@@ -76,7 +76,7 @@
         form: copyObj(formDef),
 
         rules: {
-          deptId: [{ required: true, message: '分管部门', trigger: 'change' }],
+          fgDeptId: [{ required: true, message: '分管部门', trigger: 'change' }],
           salesmanId: [{ required: true, message: '业务员', trigger: 'blur' }]
         },
 
@@ -114,7 +114,7 @@
       // 选择负责人部门
       change_principalDep(id) {
         const info = this.groupData.find((e) => e.id == id);
-        this.form.deptName = info.name;
+        this.form.fgDeptName = info.name;
         this.form.salesmanId = '';
         this.form.salesmanName = '';
         // 根据部门获取人员

src/views/saleManage/contact/components/contactDetailDialog.vue

@@ -29,10 +29,10 @@
             <el-col :span="8">
               <el-form-item
                 label="分管部门："
-                prop="deptId"
+                prop="fgDeptId"
 
               >
-                <el-input v-model="form.deptName" disabled></el-input>
+                <el-input v-model="form.fgDeptName" disabled></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">

src/views/saleManage/contact/components/contactSearch.vue

@@ -38,7 +38,7 @@
           </el-select>
         </el-form-item>
       </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+      <el-col style="display: flex;justify-content: end" v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <div class="ele-form-actions">
           <el-button
             type="primary"

src/views/saleManage/contact/contactList.vue

@@ -7,7 +7,7 @@
     :right-style="{ overflow: 'hidden' }"
   >
     <div>
-      <div class="ele-border-lighter sys-organization-list">
+      <div class="ele-border-lighter sys-organization-list" style="margin-left: 10px">
         <AssetTree
           @handleNodeClick="handleNodeClick"
           :defaultExpandedKeys="defaultExpandedKeys"
@@ -20,7 +20,7 @@
     </div>
 
     <template v-slot:content>
-      <div class="ele-border-lighter form-content" v-loading="loading">
+      <div class="ele-border-lighter form-content" v-loading="loading" style="margin-right: 10px">
         <contact-search @search="reload"> </contact-search>
 
         <!-- 数据表格 -->
@@ -28,7 +28,8 @@
           ref="table"
           :columns="columns"
           :datasource="datasource"
-          height="calc(100vh - 325px)"
+          height="calc(100vh - 365px)"
+          style="margin-bottom: 15px"
           full-height="calc(100vh - 116px)"
           tool-class="ele-toolbar-form"
           :selection.sync="selection"

src/views/saleManage/contact/contactListAdmin.vue

@@ -7,7 +7,7 @@
     :right-style="{ overflow: 'hidden' }"
   >
     <div>
-      <div class="ele-border-lighter sys-organization-list">
+      <div class="ele-border-lighter sys-organization-list" style="margin-left: 10px">
         <AssetTree
           @handleNodeClick="handleNodeClick"
           :defaultExpandedKeys="defaultExpandedKeys"
@@ -20,7 +20,7 @@
     </div>
 
     <template v-slot:content>
-      <div class="ele-border-lighter form-content" v-loading="loading">
+      <div class="ele-border-lighter form-content" v-loading="loading" style="margin-right: 10px">
         <contact-search @search="reload"> </contact-search>
 
         <!-- 数据表格 -->
@@ -28,7 +28,8 @@
           ref="table"
           :columns="columns"
           :datasource="datasource"
-          height="calc(100vh - 325px)"
+          height="calc(100vh - 365px)"
+          style="margin-bottom: 15px"
           full-height="calc(100vh - 116px)"
           tool-class="ele-toolbar-form"
           :selection.sync="selection"

src/views/saleManage/contact/index.vue

@@ -23,7 +23,7 @@
         v-if="activeComp == 'myContact'"
       >
         <div>
-          <div class="ele-border-lighter sys-organization-list">
+          <div class="ele-border-lighter sys-organization-list" style="margin-left: 10px">
             <AssetTree
               @handleNodeClick="handleNodeClick"
               :defaultExpandedKeys="defaultExpandedKeys"
@@ -36,7 +36,7 @@
         </div>
 
         <template v-slot:content>
-          <div class="ele-border-lighter form-content" v-loading="loading">
+          <div class="ele-border-lighter form-content" v-loading="loading" style="margin-right: 10px">
             <contact-search @search="reload"> </contact-search>
 
             <!-- 数据表格 -->
@@ -44,7 +44,8 @@
               ref="table"
               :columns="columns"
               :datasource="datasource"
-              height="calc(100vh - 325px)"
+              height="calc(100vh - 365px)"
+              style="margin-bottom: 15px"
               full-height="calc(100vh - 116px)"
               tool-class="ele-toolbar-form"
               :selection.sync="selection"

src/views/saleManage/quotation/components/searchQuotation.vue

@@ -15,17 +15,6 @@
             v-model.trim="params.contactName"
           ></el-input>
         </el-form-item>
-        <el-form-item label="创建时间:" prop="createTimeStart">
-          <el-date-picker
-            v-model="createTime"
-            @change="changeDate"
-            type="datetimerange"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            start-placeholder="开始时间"
-            end-placeholder="结束时间"
-            :default-time="['00:00:00', '23:59:59']">
-          </el-date-picker>
-        </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg:6, md: 12 } : { span:6 }">
         <el-form-item label="总金额最小：" prop="totalPriceMin">
@@ -33,16 +22,38 @@
           placeholder="请输入"
            v-model.trim="params.totalPriceMin" controls-position="right" :min="0" ></el-input>
         </el-form-item>
-      </el-col> 
+      </el-col>
       <el-col v-bind="styleResponsive ? { lg:6, md: 12 } : { span:6 }">
         <el-form-item label="总金额最大：" prop="totalPriceMax">
           <el-input
           placeholder="请输入"
            v-model.trim="params.totalPriceMax" controls-position="right" :min="0" ></el-input>
         </el-form-item>
-      </el-col> 
+      </el-col>
+      <el-col v-bind="styleResponsive ? { lg:6, md: 12 } : { span:6 }">
+        <el-form-item label="创建时间:" prop="createTimeStart">
+          <el-date-picker
+            style="width: 100%"
+            v-model="createTime"
+            @change="changeDate"
+            type="datetimerange"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
+            :default-time="['00:00:00', '23:59:59']">
+          </el-date-picker>
+        </el-form-item>
+      </el-col>
 
-      <el-col v-bind="styleResponsive ? { lg:6, md: 12 } : { span:4 }">
+
+    </el-row>
+    <el-row :gutter="15">
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="组织机构:">
+          <auth-selection v-model="params.deptIds" style="width: 100%"></auth-selection>
+        </el-form-item>
+      </el-col>
+      <el-col style="display: flex;justify-content: end"  v-bind="styleResponsive ? { lg:18, md: 18 } : { span:18 }">
         <div class="ele-form-actions">
           <el-button
             type="primary"
@@ -55,6 +66,8 @@
           <el-button @click="reset">重置</el-button>
         </div>
       </el-col>
+
+
     </el-row>
   </el-form>
 </template>

src/views/saleManage/quotation/index.vue

@@ -9,7 +9,7 @@
           ref="table"
           :columns="columns"
           :datasource="datasource"
-          height="calc(100vh - 350px)"
+          height="calc(100vh - 375px)"
           full-height="calc(100vh - 116px)"
           tool-class="ele-toolbar-form"
           :selection.sync="selection"

src/views/saleManage/saleOrder/accountstatement/components/searchTable.vue

@@ -44,9 +44,14 @@
           </el-input>
 
         </el-form-item>
-
       </el-col>
-      <el-col v-bind="styleResponsive ? { lg:6, md: 12 } : { span:4 }">
+
+        <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+          <el-form-item label="组织机构:">
+            <auth-selection data-type="Array" v-model="params.deptIds" style="width: 100%"></auth-selection>
+          </el-form-item>
+        </el-col>
+      <el-col style="display: flex;justify-content: end" v-bind="styleResponsive ? { lg:6, md: 6 } : { span:6 }">
 
         <div class="ele-form-actions">
           <el-button

src/views/saleManage/saleOrder/accountstatement/index.vue

@@ -9,7 +9,8 @@
           ref="table"
           :columns="columns"
           :datasource="datasource"
-          height="calc(100vh - 385px)"
+          height="calc(100vh - 355px)"
+          style="margin-bottom: 10px"
           full-height="calc(100vh - 116px)"
           tool-class="ele-toolbar-form"
           :selection.sync="selection"

src/views/saleManage/saleOrder/components/inventoryTable.vue

@@ -109,14 +109,15 @@
       <template v-slot:totalCount="scope">
         <el-form-item
           style="margin-bottom: 20px"
-          :prop="'datasource.' + scope.$index + '.totalCount'"
+
+        >
+<!--  :prop="'datasource.' + scope.$index + '.totalCount'"
           :rules="{
             required: pageName == 'businessOpportunity' ? false : true,
             pattern: numberReg,
             message: '请输入数字',
             trigger: 'blur'
-          }"
-        >
+          }"         -->
           <el-input
             :disabled="isContractId"
             v-model="scope.row.totalCount"
@@ -470,13 +471,14 @@
       <template v-slot:singleWeight="scope">
         <el-form-item
           style="margin-bottom: 20px"
-          :rules="{
+
+        >
+<!--          :rules="{
             required: pricingWay==2,
             pattern: numberReg,
             trigger: ['change','blur']
           }"
-          :prop="'datasource.' + scope.$index + '.singleWeight'"
-        >
+          :prop="'datasource.' + scope.$index + '.singleWeight'"-->
           <el-input
             :disabled="isContractId"
             v-model="scope.row.singleWeight"
@@ -667,7 +669,7 @@ export default {
           prop: 'totalCount',
           label: '数量',
           slot: 'totalCount',
-          headerSlot: 'headerTotalCount',
+          // headerSlot: 'headerTotalCount',
           align: "center"
         },
         {
@@ -682,7 +684,7 @@ export default {
           prop: 'singleWeight',
           label: '单重',
           slot: 'singleWeight',
-          headerSlot: 'headerSingleWeight',
+          // headerSlot: 'headerSingleWeight',
           align: "center"
         },
         {

src/views/saleManage/saleOrder/components/searchTable.vue

@@ -22,7 +22,6 @@
         <el-form-item label="客户名称：" prop="partaName">
           <el-input
           placeholder="请输入"
-          style="max-width:320px"
            v-model.trim="params.partaName" controls-position="right" >
           </el-input>
 
@@ -38,22 +37,17 @@
           ></el-input>
         </el-form-item>
       </el-col>
-      <el-col v-bind="styleResponsive ? { lg:6, md: 12 } : { span:4 }">
-
-        <div class="ele-form-actions">
-          <el-button
-            type="primary"
-            icon="el-icon-search"
-            class="ele-btn-icon"
-            @click="search"
-          >
-            查询
-          </el-button>
-          <el-button @click="reset">重置</el-button>
-        </div>
+      <el-col v-bind="styleResponsive ? { lg:6, md: 12 } : { span:6 }">
+        <el-form-item label="合同编号：" prop="contractNumber">
+          <el-input
+            clearable
+            placeholder="请输入"
+            v-model.trim="params.contractNumber"
+          ></el-input>
+        </el-form-item>
       </el-col>
     </el-row>
-    <el-row>
+    <el-row :gutter="15">
       <!--<el-col v-bind="styleResponsive ? { lg:6, md: 12 } : { span:6 }">
         <el-form-item label="订单状态：" prop="orderStatus">
           <el-select v-model="params.orderStatus" placeholder="请选择" class="w100" clearable>
@@ -66,28 +60,37 @@
           </el-select>
         </el-form-item>
       </el-col>-->
-      <el-col v-bind="styleResponsive ? { lg:6, md: 12 } : { span:6 }">
-        <el-form-item label="合同编号：" prop="contractNumber">
-          <el-input
-            clearable
-            placeholder="请输入"
-            v-model.trim="params.contractNumber"
-          ></el-input>
-        </el-form-item>
-      </el-col>
+
       <el-col v-bind="styleResponsive ? { lg:6, md: 12 } : { span:6 }">
         <el-form-item label="创建时间：" prop="createTimeStart">
           <el-date-picker
             v-model="createTime"
             @change="changeDate"
             type="datetimerange"
-            style="width:320px"
+            style="width:100%"
             value-format="yyyy-MM-dd HH:mm:ss"
             start-placeholder="开始时间"
             end-placeholder="结束时间"
             :default-time="['00:00:00', '23:59:59']">
           </el-date-picker>
         </el-form-item>
+
+      </el-col>
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="组织机构:">
+          <auth-selection v-model="params.deptIds" style="width: 100%"></auth-selection>
+        </el-form-item>
+      </el-col>
+      <el-col style="display: flex;justify-content: end" v-bind="styleResponsive ? { lg:12, md: 12 } : { span:12 }">
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          class="ele-btn-icon"
+          @click="search"
+        >
+          查询
+        </el-button>
+        <el-button @click="reset">重置</el-button>
       </el-col>
     </el-row>
   </el-form>

src/views/saleManage/saleOrder/customerReturnOrder/index.vue

@@ -9,7 +9,8 @@
           ref="table"
           :columns="columns"
           :datasource="datasource"
-          height="calc(100vh - 385px)"
+          height="calc(100vh - 405px)"
+          style="margin-bottom: 10px"
           full-height="calc(100vh - 116px)"
           tool-class="ele-toolbar-form"
           :selection.sync="selection"

src/views/saleManage/saleOrder/customerReturnOrder/searchTable-page.vue

@@ -15,6 +15,9 @@
             v-model.trim="params.returnHandleNo"
           ></el-input>
         </el-form-item>
+
+      </el-col>
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="退货单编码：" prop="returnNo">
           <el-input
             clearable
@@ -22,6 +25,7 @@
             v-model.trim="params.returnNo"
           ></el-input>
         </el-form-item>
+
       </el-col>
       <el-col v-bind="styleResponsive ? { lg:6, md: 12 } : { span:6 }">
 <!--        <el-form-item label="发货单编码：" prop="sendNo">-->
@@ -60,7 +64,15 @@
         </el-form-item>
 
       </el-col>
-      <el-col v-bind="styleResponsive ? { lg:6, md: 12 } : { span:4 }">
+
+    </el-row>
+    <el-row :gutter="15">
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="组织机构:">
+          <auth-selection v-model="params.deptIds" style="width: 100%"></auth-selection>
+        </el-form-item>
+      </el-col>
+      <el-col style="display: flex;justify-content: end" v-bind="styleResponsive ? { lg:18, md: 18 } : { span:18 }">
 
         <div class="ele-form-actions">
           <el-button

src/views/saleManage/saleOrder/entrustedReceive/components/searchTable.vue

@@ -37,7 +37,15 @@
         </el-form-item>
 
       </el-col>
-      <el-col v-bind="styleResponsive ? { lg:6, md: 12 } : { span:4 }">
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="组织机构:">
+          <auth-selection v-model="params.deptIds" style="width: 100%"></auth-selection>
+        </el-form-item>
+      </el-col>
+
+    </el-row>
+    <el-row>
+      <el-col style="display: flex;justify-content: end" v-bind="styleResponsive ? { lg:24, md: 24 } : { span:24 }">
 
         <div class="ele-form-actions">
           <el-button

src/views/saleManage/saleOrder/entrustedReceive/index.vue

@@ -9,7 +9,8 @@
           ref="table"
           :columns="columns"
           :datasource="datasource"
-          height="calc(100vh - 385px)"
+          height="calc(100vh - 360px)"
+          style="margin-bottom: 10px"
           full-height="calc(100vh - 116px)"
           tool-class="ele-toolbar-form"
           :selection.sync="selection"

src/views/saleManage/saleOrder/index.vue

@@ -15,7 +15,7 @@
           </ul>
         </div>
       </div>
-      <div class="main">
+      <div class="main" style="padding: 0 10px">
         <div v-if="activeComp == 'saleorder'">
           <div class="ele-border-lighter form-content" v-loading="loading">
             <search-table @search="reload"></search-table>
@@ -25,7 +25,8 @@
               ref="table"
               :columns="columns"
               :datasource="datasource"
-              height="calc(100vh - 385px)"
+              height="calc(100vh - 410px)"
+              style="margin-bottom: 10px"
               full-height="calc(100vh - 116px)"
               tool-class="ele-toolbar-form"
               :selection.sync="selection"

src/views/saleManage/saleOrder/invoice/components/searchTable.vue

@@ -15,6 +15,9 @@
             v-model.trim="params.docNo"
           ></el-input>
         </el-form-item>
+
+      </el-col>
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="订单编码：" prop="orderNo">
           <el-input
             clearable
@@ -22,6 +25,7 @@
             v-model.trim="params.orderNo"
           ></el-input>
         </el-form-item>
+
       </el-col>
        <el-col v-bind="styleResponsive ? { lg:6, md: 12 } : { span:6 }">
         <el-form-item label="是否回执：" prop="replied">
@@ -57,7 +61,15 @@
         </el-form-item>
 
       </el-col>
-      <el-col v-bind="styleResponsive ? { lg:6, md: 12 } : { span:4 }">
+
+    </el-row>
+    <el-row :gutter="15">
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="组织机构:">
+          <auth-selection v-model="params.deptIds" style="width: 100%"></auth-selection>
+        </el-form-item>
+      </el-col>
+      <el-col style="display: flex;justify-content: end" v-bind="styleResponsive ? { lg:18, md: 18 } : { span:18 }">
 
         <div class="ele-form-actions">
           <el-button

src/views/saleManage/saleOrder/invoice/index.vue

@@ -9,7 +9,9 @@
           ref="table"
           :columns="columns"
           :datasource="datasource"
-          height="calc(100vh - 385px)"
+          height="calc(100vh - 410px)"
+          style="margin-bottom: 10px"
+
           full-height="calc(100vh - 116px)"
           tool-class="ele-toolbar-form"
           :selection.sync="selection"

src/views/saleManage/saleOrder/returnGoods/components/searchTable.vue

@@ -15,6 +15,9 @@
             v-model.trim="params.returnNo"
           ></el-input>
         </el-form-item>
+
+      </el-col>
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="订单编码：" prop="orderNo">
           <el-input
             clearable
@@ -22,8 +25,9 @@
             v-model.trim="params.orderNo"
           ></el-input>
         </el-form-item>
+
       </el-col>
-       <el-col v-bind="styleResponsive ? { lg:6, md: 12 } : { span:6 }">
+      <el-col v-bind="styleResponsive ? { lg:6, md: 12 } : { span:6 }">
         <el-form-item label="发货单编码：" prop="sendNo">
           <el-input
             clearable
@@ -31,6 +35,9 @@
             v-model.trim="params.sendNo"
           ></el-input>
         </el-form-item>
+
+      </el-col>
+      <el-col v-bind="styleResponsive ? { lg:6, md: 12 } : { span:6 }">
         <el-form-item label="审核状态：" prop="reviewStatus">
           <el-select v-model="params.reviewStatus" placeholder="请选择" class="w100" clearable>
             <el-option
@@ -41,21 +48,29 @@
             ></el-option>
           </el-select>
         </el-form-item>
-      </el-col>  
+
+      </el-col>
+    </el-row>
+    <el-row :gutter="15">
       <el-col v-bind="styleResponsive ? { lg:6, md: 12 } : { span:6 }">
-       
+
         <el-form-item label="客户名称：" prop="contactName">
           <el-input
-          placeholder="请输入"
-          style="max-width:320px"
-           v-model.trim="params.contactName" controls-position="right" >
+            placeholder="请输入"
+            style="max-width:320px"
+            v-model.trim="params.contactName" controls-position="right">
           </el-input>
-         
+
         </el-form-item>
-        
-      </el-col> 
-      <el-col v-bind="styleResponsive ? { lg:6, md: 12 } : { span:4 }">
-      
+
+      </el-col>
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="组织机构:">
+          <auth-selection v-model="params.deptIds" style="width: 100%"></auth-selection>
+        </el-form-item>
+      </el-col>
+      <el-col style="display: flex;justify-content: end" v-bind="styleResponsive ? { lg:12, md: 12 } : { span:12 }">
+
         <div class="ele-form-actions">
           <el-button
             type="primary"
@@ -73,52 +88,53 @@
 </template>
 <script>
 import {reviewStatusEnum} from '@/enum/dict';
-const repliedOptions=[
-  {value:0,label:'否'},
-  {value:1,label:'是'},
+
+const repliedOptions = [
+  {value: 0, label: '否'},
+  {value: 1, label: '是'},
 ]
-  export default {
-    data () {
-      // 默认表单数据
-      const defaultParams = {
-        contractName: '',
-        contractId:'',
-        docNo:'',
-        orderId:'',
-        replied:null,
-        reviewStatus:null
-      };
-      return {
-        reviewStatusEnum,
-        defaultParams,
-        repliedOptions,
-        // 表单数据
-        params: { ...defaultParams }
-      };
+export default {
+  data() {
+    // 默认表单数据
+    const defaultParams = {
+      contractName: '',
+      contractId: '',
+      docNo: '',
+      orderId: '',
+      replied: null,
+      reviewStatus: null
+    };
+    return {
+      reviewStatusEnum,
+      defaultParams,
+      repliedOptions,
+      // 表单数据
+      params: {...defaultParams}
+    };
+  },
+  computed: {
+    // 是否开启响应式布局
+    styleResponsive() {
+      return this.$store.state.theme.styleResponsive;
+    }
+  },
+  methods: {
+    //选择时间
+    changeDate(e) {
+      this.createTime = e
     },
-    computed: {
-      // 是否开启响应式布局
-      styleResponsive () {
-        return this.$store.state.theme.styleResponsive;
-      }
+    /* 搜索 */
+    search() {
+      this.$emit('search', {
+        ...this.params
+      });
     },
-    methods: {
-      //选择时间
-      changeDate(e){
-       this.createTime=e
-      },
-      /* 搜索 */
-      search () {
-        this.$emit('search', {
-          ...this.params
-        });
-      },
-      /*  重置 */
-      reset () {
-        this.createTime=[]
-        this.params = Object.assign({},{ ...this.defaultParams });
-        this.search();
-      }
+    /*  重置 */
+    reset() {
+      this.createTime = []
+      this.params = Object.assign({}, {...this.defaultParams});
+      this.search();
     }
-  };
+  }
+};
 </script>

src/views/saleManage/saleOrder/returnGoods/index.vue

@@ -9,7 +9,8 @@
           ref="table"
           :columns="columns"
           :datasource="datasource"
-          height="calc(100vh - 385px)"
+          height="calc(100vh - 405px)"
+          style="margin-bottom: 10px"
           full-height="calc(100vh - 116px)"
           tool-class="ele-toolbar-form"
           :selection.sync="selection"

src/views/transportManager/carBook/index.vue

@@ -7,7 +7,7 @@
         ref="table"
         :columns="columns"
         :datasource="datasource"
-        height="calc(100vh - 420px)"
+        height="calc(100vh - 325px)"
         full-height="calc(100vh - 116px)"
         tool-class="ele-toolbar-form"
         :selection.sync="selection"

src/views/transportManager/carBook/indexSearchTable.vue

@@ -25,6 +25,11 @@
           ></el-input>
         </el-form-item>
       </el-col>
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="组织机构:">
+          <auth-selection v-model="params.deptIds" style="width: 100%"></auth-selection>
+        </el-form-item>
+      </el-col>
 <!--      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">-->
 <!--        <el-form-item label="司机电话：" prop="phone">-->
 <!--          <el-input-->
@@ -58,7 +63,7 @@
 <!--        </el-form-item>-->
 
 <!--      </el-col>-->
-      <el-col v-bind="styleResponsive ? { lg:6, md: 12 } : { span:4 }">
+      <el-col style="display: flex;justify-content: end" v-bind="styleResponsive ? { lg:6, md: 12 } : { span:6 }">
 
         <div class="ele-form-actions">
           <el-button

src/views/transportManager/driverBook/index.vue

@@ -7,7 +7,7 @@
         ref="table"
         :columns="columns"
         :datasource="datasource"
-        height="calc(100vh - 420px)"
+        height="calc(100vh - 325px)"
         full-height="calc(100vh - 116px)"
         tool-class="ele-toolbar-form"
         :selection.sync="selection"

src/views/transportManager/driverBook/indexSearchTable.vue

@@ -21,6 +21,11 @@
           <dict-selection dict-name="驾照类型" v-model="params.drivingLicenseType"></dict-selection>
         </el-form-item>
       </el-col>
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="组织机构:">
+          <auth-selection data-type="Array" v-model="params.deptIds" style="width: 100%"></auth-selection>
+        </el-form-item>
+      </el-col>
 <!--       <el-col v-bind="styleResponsive ? { lg:6, md: 12 } : { span:6 }">-->
 <!--        <el-form-item label="费用类型：" prop="feeTypeName">-->
 <!--          <el-input-->
@@ -45,7 +50,7 @@
 <!--        </el-form-item>-->
 
 <!--      </el-col>-->
-      <el-col v-bind="styleResponsive ? { lg:6, md: 12 } : { span:4 }">
+      <el-col style="display: flex;justify-content: end" v-bind="styleResponsive ? { lg:6, md: 12 } : { span:6 }">
 
         <div class="ele-form-actions">
           <el-button

src/views/transportManager/shipManage/dispatchManage/components/addOrEditDialog.vue

@@ -61,13 +61,13 @@
         <el-col :span="8">
           <el-form-item
             label="负责部门"
-            prop="deptId"
+            prop="responsibleDeptId"
             style="margin-bottom: 22px"
           >
             <ele-tree-select
               clearable
               :data="deptTreeList"
-              v-model="form.deptId"
+              v-model="form.responsibleDeptId"
               valueKey="id"
               labelKey="name"
               placeholder="请选择"
@@ -163,8 +163,8 @@ export default {
         planName: '',
         responsiblePersonName: '',
         responsiblePersonId: '',
-        deptName: '',
-        deptId: '',
+        responsibleDeptName: '',
+        responsibleDeptId: '',
         urgencyLevel: '1',
         automatic: 1,
         planTimeStart: '',
@@ -177,7 +177,7 @@ export default {
       rules: {
         planName: [{required: true, message: '请输入计划名称', trigger: 'blur'}],
         responsiblePersonId: [{required: true, message: '请选择负责人', trigger: 'change'}],
-        deptId: [{required: true, message: '请选择负责部门', trigger: 'change'}],
+        responsibleDeptId: [{required: true, message: '请选择负责部门', trigger: 'change'}],
         planTimeStart: [{required: true, message: '请选择计划时间', trigger: 'change'}],
       }
     }
@@ -201,7 +201,7 @@ export default {
       this.planTimeDate = [this.form.planTimeStart, this.form.planTimeEnd]
       this.form.urgencyLevel = this.form.urgencyLevel + ''
       // 根据部门获取人员
-      this.getUserList(this.form.deptId);
+      this.getUserList(this.form.responsibleDeptId);
     },
     // 获取部门数据
     getDeptList() {
@@ -217,7 +217,7 @@ export default {
     // 选择负责人部门
     changeDeptInfo(id) {
       const info = this.deptList.find((e) => e.id == id);
-      this.form.deptName = info.name;
+      this.form.responsibleDeptName = info.name;
       this.form.responsiblePersonName = '';
       this.form.responsiblePersonId = '';
       // 根据部门获取人员

src/views/transportManager/shipManage/dispatchManage/components/detailDialog.vue

@@ -62,8 +62,8 @@
           <el-col :span="8">
             <el-form-item
               label="负责部门："
-              prop="deptName">
-              <el-input v-model="form.deptName" disabled></el-input>
+              prop="responsibleDeptName">
+              <el-input v-model="form.responsibleDeptName" disabled></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">

src/views/transportManager/shipManage/dispatchManage/page.vue

@@ -6,7 +6,7 @@
       ref="table"
       :columns="columns"
       :datasource="datasource"
-      height="calc(100vh - 420px)"
+      height="calc(100vh - 430px)"
       full-height="calc(100vh - 116px)"
       tool-class="ele-toolbar-form"
       :selection.sync="selection"

src/views/transportManager/shipManage/dispatchManage/pageSearchTable.vue

@@ -50,7 +50,12 @@
           </el-select>
         </el-form-item>
       </el-col>
-      <el-col v-bind="styleResponsive ? { lg:6, md: 12 } : { span:4 }">
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="组织机构:">
+          <auth-selection data-type="Array" v-model="params.deptIds" style="width: 100%"></auth-selection>
+        </el-form-item>
+      </el-col>
+      <el-col style="display: flex;justify-content: end" v-bind="styleResponsive ? { lg:12, md: 12 } : { span:12 }">
 
         <div class="ele-form-actions">
           <el-button

src/views/transportManager/shipManage/taskWorkManage/page.vue

@@ -6,7 +6,7 @@
       ref="table"
       :columns="columns"
       :datasource="datasource"
-      height="calc(100vh - 420px)"
+      height="calc(100vh - 430px)"
       full-height="calc(100vh - 116px)"
       tool-class="ele-toolbar-form"
       :selection.sync="selection"

src/views/transportManager/shipManage/taskWorkManage/pageSearchTable.vue

@@ -52,7 +52,12 @@
          </el-select>
         </el-form-item>
       </el-col>
-      <el-col v-bind="styleResponsive ? { lg:6, md: 12 } : { span:4 }">
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="组织机构:">
+          <auth-selection data-type="Array" v-model="params.deptIds" style="width: 100%"></auth-selection>
+        </el-form-item>
+      </el-col>
+      <el-col style="display: flex;justify-content: end" v-bind="styleResponsive ? { lg:12, md: 12 } : { span:12 }">
         <div class="ele-form-actions">
           <el-button
             type="primary"

vue.config.js

@@ -10,7 +10,7 @@ function resolve(dir) {
 module.exports = {
   publicPath: '/eos',
   lintOnSave: false,
-  outputDir: 'eos-dist',
+  outputDir: 'dist',
   productionSourceMap: false,
   configureWebpack: {
     performance: {