Merge branch 'sit' of http://120.46.155.214:3000/xiaodai2022/order-ui-pc into sit

src/components/globalComponents/show-goods-data-table/ShowDataTableColumns.js

@@ -125,6 +125,7 @@ const coveColumns = [
     append: 'g',
     span: 6,
   },
+ 
   {
     prop: "creater",
     label: "反馈人",

src/views/dataCorrection/cgMessageList/columns.js

@@ -67,7 +67,11 @@ const columns = [
     minWidth: "145"
   },
 
-
+  {
+    prop: "company_name",
+    label: "创建人部门",
+    minWidth: "150px",
+  },
   {
     prop: "creater",
     label: "创建人",

src/views/dataCorrection/cgMessageList/index.vue

@@ -25,7 +25,7 @@
         "
       >
         <template #table-header="{}">
-          <div style="width: 100%; height: 30px">
+          <div style="width: 100%; height: 70px">
             <el-row style="padding-left: 80px">
               <el-col :span="7" style="width: 293px">
                 <period-date-picker
@@ -53,32 +53,7 @@
                   "
                 ></el-input>
               </el-col>
-              <el-col
-                :span="5"
-                style="width: 155px; float: left; margin-left: 10px"
-              >
-                <el-input
-                  v-model="parmValue.creater"
-                  :size="'mini'"
-                   style="width: 100%"
-                  placeholder="创建人"
-                  @blur="
-                    pageInfo.curr = 1;
-                    parmValue.page = 1;
-                    searchList();
-                  "
-                ></el-input>
-              </el-col>
-              <el-col :span="3" style="width: 66px; float: right">
-                <el-button
-                  type="warning"
-                  :size="searchSize"
-                  style="float: right"
-                  @click="restSearch"
-                >
-                  重置
-                </el-button>
-              </el-col>
+
               <el-col :span="3" style="width: 66px; float: right">
                 <el-button
                   type="primary"
@@ -105,6 +80,52 @@
                 </el-button>
               </el-col>
             </el-row>
+            <el-row style="padding-top: 10px">
+          
+              <el-col
+                :span="5"
+                style="width: 155px; float: left; margin-left: 0px"
+              >
+                <el-input
+                  v-model="parmValue.creater"
+                  :size="'mini'"
+                   style="width: 100%"
+                  placeholder="创建人"
+                  @blur="
+                    pageInfo.curr = 1;
+                    parmValue.page = 1;
+                    searchList();
+                  "
+                ></el-input>
+              </el-col>
+              <el-col
+                :span="5"
+                style="width: 155px; float: left; margin-left: 10px"
+              >
+                <el-input
+                  v-model="parmValue.company_name"
+                  :size="'mini'"
+                   style="width: 100%"
+                  placeholder="创建人部门"
+                  @blur="
+                    pageInfo.curr = 1;
+                    parmValue.page = 1;
+                    searchList();
+                  "
+                ></el-input>
+              </el-col>
+              <el-col :span="3" style="width: 66px; float: right">
+                <el-button
+                  type="warning"
+                  :size="searchSize"
+                  style="float: right"
+                  @click="restSearch"
+                >
+                  重置
+                </el-button>
+              </el-col>
+             
+            </el-row>
           </div>
         </template>
       </ex-table>
@@ -146,6 +167,7 @@ export default {
         creater: "",
         start: "",
         end: "",
+        company_name: "", //创建人部门
         page: 1, // 页码
         size: 15, // 每页显示条数
       },
@@ -207,6 +229,7 @@ export default {
       };
       this.parmValue = {
         cgdNo: "",
+        company_name: "", //创建人部门
         creater: "",
         start: "",
         end: "",

src/views/goodStore/active/columns.js

@@ -62,6 +62,11 @@ const listCol = [
     prop: "platform_name",
     label: "平台名称",
   },
+  {
+    prop: "company_name",
+    label: "创建人部门",
+    minWidth: "150px",
+  },
   {
     prop: "creater",
     label: "创建人",

src/views/goodStore/active/index.vue

@@ -123,7 +123,8 @@
                 >
                   <el-option label="活动名称" value="1" />
                   <el-option label="活动编码" value="2" />
-                  <el-option label="创建人" value="3" /> </el-select
+                  <el-option label="创建人" value="3" /> 
+                  <el-option label="创建人部门"  value="4"></el-option></el-select
               ></el-input>
             </el-col>
             <el-col
@@ -231,6 +232,7 @@ export default {
         size: 15, // 每页显示条数
         company_id: "",
         creater: "",
+        company_name: "", //创建人部门
       },
       // 状态
       statusOptions: [
@@ -335,6 +337,7 @@ export default {
         size: 15, // 每页显示条数
         company_id: "",
         creater: "",
+        company_name: "", //创建人部门
       };
       this.searchList();
     },
@@ -449,6 +452,7 @@ export default {
       model.activity_name = this.select === "1" ? this.sinput : "";
       model.activity_code = this.select === "2" ? this.sinput : "";
       model.creater = this.select === "3" ? this.sinput : "";
+      model.company_name = this.select === "4" ? this.sinput : ""; // 部门
       const res = await asyncRequest.list(model);
       if (res && res.code === 0 && res.data) {
         this.tableData = res.data.list;

src/views/goodStore/brand/index.vue

@@ -103,6 +103,19 @@
                 placeholder="创建人"
               ></el-input>
             </el-col>
+            <el-col :span="4" style="width: 170px; padding: 0 0 0 10px">
+              <el-input
+                :size="searchSize"
+                v-model="parmValue.company_name"
+                :maxlength="40"
+                @change="
+                  pageInfo.curr = 1;
+                  parmValue.page = 1;
+                  searchList();
+                "
+                placeholder="创建人部门"
+              ></el-input>
+            </el-col>
             <el-col
               :span="3"
               class="fr"
@@ -248,6 +261,7 @@ export default {
         start: "",
         end: "",
         brand_name: "",
+        company_name: "", //创建人部门
         status: "",
         creater: "",
       },
@@ -286,6 +300,11 @@ export default {
           sortable: true,
           _slot_: "status",
         },
+        {
+          prop: "company_name",
+          label: "申请人部门",
+          minWidth: "150px",
+        },
         {
           prop: "creater",
           label: "创建人",
@@ -320,6 +339,7 @@ export default {
         page: 1, // 页码
         size: 15, // 每页显示条数
         start: "",
+        company_name: "", //创建人部门
         end: "",
         brand_name: "",
         status: "",

src/views/goodStore/goldPrice/components/priceList.vue

@@ -11,7 +11,18 @@
           @searchChange="noble_metalsearchChange"
         />
       </el-col>
+      <el-col :span="4" style="width: 170px; padding: 0 0 0 10px">
+        <el-input
+          :size="searchSize"
+          v-model="parmValue.company_name"
+          :maxlength="40"
+          @blur="
 
+            searchList
+          "
+          placeholder="创建人部门"
+        ></el-input>
+      </el-col>
       <el-col :span="3" class="fr" style="width: 66px; padding: 0 0 0 10px">
         <el-button type="primary" :size="searchSize" @click="searchList">
           刷新
@@ -61,6 +72,8 @@
               ></el-tag
             ></template>
           </el-table-column>
+          <el-table-column prop="company_name" label="创建人部门" />
+
           <el-table-column prop="action_name" label="创建人" />
           <el-table-column prop="addtime" label="创建时间" />
           <el-table-column label="操作">
@@ -175,6 +188,7 @@ export default {
       modelId: "000",
       sitem: {},
       parmValue: {
+        company_name: "", //创建人部门
         type: "",
       },
       // 状态
@@ -192,6 +206,7 @@ export default {
   methods: {
     async restSearch() {
       this.parmValue = {
+        company_name: "", //创建人部门
         type: "",
       };
       await this.searchList();

src/views/goodStore/goldPrice/components/priceRecord.vue

@@ -43,7 +43,19 @@
                 @searchChange="noble_metalsearchChange"
               />
             </el-col>
-            <el-col :span="4" style="width: 170px; padding: 0 0 0 10px">
+
+            <el-col
+              :span="3"
+              class="fr"
+              style="width: 66px; padding: 0 0 0 10px"
+            >
+              <el-button type="warning" :size="searchSize" @click="restSearch">
+                重置
+              </el-button>
+            </el-col>
+          </el-row>
+          <el-row style="padding: 10px 0 0 0px">
+            <el-col :span="4" style="width: 170px; padding: 0 0 0 0px">
               <el-input
                 :size="searchSize"
                 v-model="parmValue.action_name"
@@ -56,7 +68,19 @@
                 placeholder="创建人"
               ></el-input>
             </el-col>
-
+            <el-col :span="4" style="width: 170px; padding: 0 0 0 10px">
+              <el-input
+                :size="searchSize"
+                v-model="parmValue.company_name"
+                :maxlength="40"
+                @blur="
+                  pageInfo.curr = 1;
+                  parmValue.page = 1;
+                  searchList();
+                "
+                placeholder="创建人部门"
+              ></el-input>
+            </el-col>
             <el-col
               :span="3"
               class="fr"
@@ -66,15 +90,6 @@
                 刷新
               </el-button>
             </el-col>
-            <el-col
-              :span="3"
-              class="fr"
-              style="width: 66px; padding: 0 0 0 10px"
-            >
-              <el-button type="warning" :size="searchSize" @click="restSearch">
-                重置
-              </el-button>
-            </el-col>
           </el-row>
         </div></template
       >
@@ -101,6 +116,7 @@ export default {
         size: 15, // 每页显示条数
         start: "",
         end: "",
+        company_name: "", //创建人部门
         type: "",
         action_name: "",
       },
@@ -134,7 +150,11 @@ export default {
           prop: "price",
           label: "当前金价(元/g)",
         },
-
+        {
+          prop: "company_name",
+          label: "创建人部门",
+          minWidth: "150px",
+        },
         {
           prop: "action_name",
           label: "创建人",
@@ -159,6 +179,7 @@ export default {
       };
       this.parmValue = {
         page: 1, // 页码
+        company_name: "", //创建人部门
         size: 15, // 每页显示条数
         start: "",
         end: "",

src/views/goodStore/goodsCost/columns.js

@@ -101,6 +101,11 @@ const listCol = [
     label: "业务公司名称",
     width: "110px",
   },
+  {
+    prop: "company_name",
+    label: "创建人部门",
+    minWidth: "150px",
+  },
   {
     prop: "creater",
     label: "创建人",

src/views/goodStore/goodsCost/index.vue

@@ -146,7 +146,9 @@
                   <el-option label="商品编号" value="1" />
                   <el-option label="商品名称" value="2" />
                   <el-option label="业务企业编号" value="3" />
-                  <el-option label="供应商编号" value="4" /> </el-select
+                  <el-option label="供应商编号" value="4" /> 
+                  <el-option label="创建人部门" value="5" /> 
+                  </el-select
               ></el-input>
             </el-col>
 
@@ -446,6 +448,7 @@ export default {
         companyNo: "",
         supplierNo: "",
         isonline: "",
+        company_name: "", //创建人部门
         // creater: "",
       },
       sinput: "",
@@ -544,6 +547,7 @@ export default {
         end: "",
         status: "",
         good_name: "",
+        company_name: "", //创建人部门
         spucode: "",
         cat_id: [],
         brandid: "",
@@ -737,6 +741,7 @@ export default {
       item.good_name = this.select === "2" ? this.sinput : "";
       item.companyNo = this.select === "3" ? this.sinput : "";
       item.supplierNo = this.select === "4" ? this.sinput : "";
+      item.company_name = this.select === "5" ? this.sinput : ""; // 部门
       item.cat_id =
         item.cat_id.length > 0 ? item.cat_id[item.cat_id.length - 1] : "";
       const res = await asyncRequest.list(item);

src/views/goodStore/goodsOnline/columns.js

@@ -121,6 +121,11 @@ const listCol = [
     label: "采购员",
     width: "70px",
   },
+  {
+    prop: "company_name",
+    label: "创建人部门",
+    minWidth: "150px",
+  },
   {
     prop: "creater",
     label: "创建人",

src/views/goodStore/goodsOnline/index.vue

@@ -164,7 +164,9 @@
                   <!-- <el-option label="供应商编号" value="4" /> -->
                   <el-option label="业务企业编号" value="5" />
                   <el-option label="平台商品编号" value="6" />
-                  <el-option label="创建人" value="7" /> </el-select
+                  <el-option label="创建人" value="7" /> 
+                  <el-option label="创建人部门" value="8" /> 
+                  </el-select
               ></el-input>
             </el-col>
             <el-col
@@ -297,14 +299,22 @@
         class="demo-ruleForm"
         label-width="80px"
       >
-        <el-form-item prop="date" label="日期: ">
-          <el-date-picker
+        <el-form-item prop="start_date" label="日期: ">
+          <!-- <el-date-picker
             value-format="yyyy-MM-dd"
             v-model="ruleForm.date"
             type="date"
             placeholder="请选择"
           >
-          </el-date-picker>
+          </el-date-picker> -->
+
+          <periodDatePicker
+                      :start="ruleForm.start_date"
+                      :end="ruleForm.end_date"
+                      :width="'165px'"
+
+                      @timeReturned="time"
+                    />
         </el-form-item>
         <el-form-item label="状态: " prop="status">
           <el-select v-model="ruleForm.status" placeholder="请选择">
@@ -381,12 +391,14 @@ export default {
     return {
       fileUrl: urlConfig.baseURL,
       ruleForm: {
-        date: "",
+        // date: "",
         platform_id: "",
         status: "",
+        start_date:"",
+        end_date:"",
       },
       rules: {
-        date: [
+        start_date: [
           {
             validator: validate,
             type: "date",
@@ -421,6 +433,7 @@ export default {
         exam_status: "", //审核状态
         plat_code: "", //平台商品编号
         creater: "", //
+        company_name: "", //创建人部门
       },
 
       // 表格 - 数据
@@ -475,6 +488,12 @@ export default {
     this.searchList();
   },
   methods: {
+    // 时间函数
+    async time(e) {
+      this.ruleForm.start_date = e.startTime || "";
+      this.ruleForm.end_date = e.endTime || "";
+      
+    },
     platform_codesearchChange(e) {
       const { id } = e;
       this.ruleForm.platform_id = id || "";
@@ -489,6 +508,13 @@ export default {
     },
     //导出
     async goodsExport() {
+      if (
+        (this.ruleForm.start_date !== "" && this.ruleForm.end_date === "") ||
+        (this.ruleForm.start_date === "" && this.ruleForm.end_date !== "")
+      ) {
+        this.$message.warning("时间区间不完整！");
+        return;
+      }
       // console.log(this.$refs.ruleForm)
       // return;
       await this.$refs.ruleForm.validate(async (valid) => {
@@ -610,6 +636,7 @@ export default {
         exam_status: "", //审核状态
         plat_code: "", //平台商品编号
         creater: "", //
+        company_name: "", //创建人部门
       };
       this.searchList();
     },
@@ -797,6 +824,7 @@ export default {
       // model.exam_status = this.select === "1" ? this.sinput : ""; //审核状态
       model.plat_code = this.select === "6" ? this.sinput : ""; //平台商品编号
       model.creater = this.select === "7" ? this.sinput : ""; //
+      model.company_name = this.select === "8" ? this.sinput : ""; // 部门
       const res = await asyncRequest.list(model);
       if (res && res.code === 0 && res.data) {
         this.tableData = res.data.list;

src/views/goodStore/searchSort/index.vue

@@ -113,6 +113,19 @@
                   placeholder="创建人"
                 ></el-input>
               </el-col>
+              <el-col :span="4" style="width: 170px; padding: 0 0 0 10px">
+                <el-input
+                  :size="searchSize"
+                  v-model="parmValue.company_name"
+                  :maxlength="40"
+                  @change="
+                    pageInfo.curr = 1;
+                    parmValue.page = 1;
+                    searchList();
+                  "
+                  placeholder="创建人部门"
+                ></el-input>
+              </el-col>
             </el-row></div
         ></template>
         <template #status="{ scope }">
@@ -192,6 +205,7 @@ export default {
         end: "",
         status: "",
         creater: "",
+        company_name: "", //创建人部门
         cat_name: "",
       },
       // 状态
@@ -250,6 +264,11 @@ export default {
           prop: "cat_desc",
           label: "售后说明",
         },
+        {
+          prop: "company_name",
+          label: "创建人部门",
+          minWidth: "150px",
+        },
         {
           prop: "creater",
           label: "创建人",
@@ -290,6 +309,7 @@ export default {
         start: "",
         end: "",
         status: "",
+        company_name: "", //创建人部门
         creater: "",
         cat_name: "",
       };

src/views/goodStore/sort/index.vue

@@ -39,6 +39,7 @@
                 </div>
               </div>
             </el-col>
+            
             <el-col
               :span="3"
               class="fr"
@@ -94,7 +95,19 @@
                 placeholder="分类名称"
               ></el-input>
             </el-col>
-
+            <el-col :span="4" style="width: 170px; padding: 0 0 0 10px">
+              <el-input
+                :size="searchSize"
+                v-model="parmValue.company_name"
+                :maxlength="40"
+                @blur="
+                  pageInfo.curr = 1;
+                  parmValue.page = 1;
+                  searchList();
+                "
+                placeholder="创建人部门"
+              ></el-input>
+            </el-col>
             <el-col
               :span="3"
               class="fr"
@@ -271,6 +284,7 @@ export default {
       parmValue: {
         page: 1, // 页码
         size: 15, // 每页显示条数
+        company_name: "", //创建人部门
         status: "",
         cat_name: "",
         pid: "0",
@@ -332,6 +346,11 @@ export default {
           prop: "cat_desc",
           label: "售后说明",
         },
+        {
+          prop: "company_name",
+          label: "创建人部门",
+          minWidth: "150px",
+        },
         {
           prop: "creater",
           label: "创建人",
@@ -370,6 +389,7 @@ export default {
         page: 1, // 页码
         size: 15, // 每页显示条数
         status: "",
+        company_name: "", //创建人部门
         pid: "0",
         cat_name: "",
       };

src/views/goodStore/specs/index.vue

@@ -103,6 +103,19 @@
                 placeholder="创建人"
               ></el-input>
             </el-col>
+            <el-col :span="4" style="width: 170px; padding: 0 0 0 10px">
+              <el-input
+                :size="searchSize"
+                v-model="parmValue.company_name"
+                :maxlength="40"
+                @change="
+                  pageInfo.curr = 1;
+                  parmValue.page = 1;
+                  searchList();
+                "
+                placeholder="创建人部门"
+              ></el-input>
+            </el-col>
             <el-col
               :span="3"
               class="fr"
@@ -249,6 +262,7 @@ export default {
         end: "",
         status: "",
         creater: "",
+        company_name: "", //创建人部门
         spec_name: "",
       },
       // 状态
@@ -286,6 +300,11 @@ export default {
           sortable: true,
           _slot_: "status",
         },
+        {
+          prop: "company_name",
+          label: "创建人部门",
+          // minWidth: "150px",
+        },
         {
           prop: "creater",
           label: "创建人",
@@ -320,6 +339,7 @@ export default {
         page: 1, // 页码
         size: 15, // 每页显示条数
         start: "",
+        company_name: "", //创建人部门
         end: "",
         status: "",
         creater: "",

src/views/goodStore/unit/index.vue

@@ -103,6 +103,19 @@
                 placeholder="创建人"
               ></el-input>
             </el-col>
+            <el-col :span="4" style="width: 170px; padding: 0 0 0 10px">
+              <el-input
+                :size="searchSize"
+                v-model="parmValue.company_name"
+                :maxlength="40"
+                @change="
+                  pageInfo.curr = 1;
+                  parmValue.page = 1;
+                  searchList();
+                "
+                placeholder="创建人部门"
+              ></el-input>
+            </el-col>
             <el-col
               :span="3"
               class="fr"
@@ -248,6 +261,7 @@ export default {
         end: "",
         unit: "",
         status: "",
+        company_name: "", //创建人部门
         creater: "",
       },
       // 状态
@@ -285,6 +299,11 @@ export default {
           sortable: true,
           _slot_: "status",
         },
+        {
+          prop: "company_name",
+          label: "创建人部门",
+          // minWidth: "150px",
+        },
         {
           prop: "creater",
           label: "创建人",
@@ -320,6 +339,7 @@ export default {
         size: 15, // 每页显示条数
         start: "",
         end: "",
+        company_name: "", //创建人部门
         unit: "",
         status: "",
         creater: "",

src/views/orderEntry/orderEnter/columns.js

@@ -104,6 +104,11 @@ const listCol = [{
   label: "其他单号",
   width: "140px",
 },
+{
+  prop: "company_name",
+  label: "导入人部门",
+  minWidth: "150px",
+},
 {
   prop: "creater",
   label: "导入人",

src/views/orderEntry/orderEnter/index.vue

@@ -291,6 +291,7 @@ export default {
         { value: "2", label: "平台商品编号" },
         { value: "3", label: "PO编号" },
         { value: "4", label: "录入订单编号" },
+        { value: "5", label: "导入人部门" },
       ],
       parmValue: {
         status: "",
@@ -307,6 +308,7 @@ export default {
         orderCode: "",
         page: 1,
         size: 15,
+        company_name: "", //导入人部门
       },
       changeList: [],
       // 表格 - 分页
@@ -481,6 +483,7 @@ export default {
       this.parmValue.plat_code = this.selectValue == "2" ? this.inputValue : "";
       this.parmValue.po_code = this.selectValue == "3" ? this.inputValue : "";
       this.parmValue.orderCode = this.selectValue == "4" ? this.inputValue : "";
+      this.parmValue.company_name = this.selectValue == "5" ? this.inputValue : "";
 
       this.loading = true;
       let res = await asyncRequest.orderimportlist(this.parmValue);
@@ -630,6 +633,7 @@ export default {
         platform_time_start: "",
         addtime_end: "",
         addtime_start: "",
+        company_name: "", //导入人部门
         orderCode: "",
         page: 1,
         size: 15,

src/views/purchaseIn/purchaseDiffOrder/columns.js

@@ -10,6 +10,11 @@ export default [
           _slot_: "status",
           width: "120px",
         },
+        {
+          prop: "company_name",
+          label: "申请人部门",
+          minWidth: "100px",
+        },
         {
           prop: "apply_name",
           label: "申请人",

src/views/purchaseIn/purchaseDiffOrder/index.vue

@@ -103,6 +103,7 @@
                   >
                     <el-option label="采购单编号" value="cgdNo"></el-option>
                     <el-option label="申请人" value="apply_name"></el-option>
+                    <el-option label="申请人部门"  value="company_name"></el-option>
                   </el-select>
                   <el-button
                     slot="append"
@@ -203,6 +204,7 @@ export default {
         status: "", //工差单状态
         start: "", //
         end: "",
+        company_name:"", //部门
         page: 1, // 页码
         size: 15, // 每页显示条数
       },
@@ -292,6 +294,7 @@ export default {
         status: "", //
         start: "", //
         end: "",
+        company_name:"", //部门
         page: 1, // 页码
         size: 15, // 每页显示条数
       };
@@ -419,6 +422,7 @@ export default {
     },
     async handleValue() {
       this.parmValue.cgdNo = this.select === "cgdNo" ? this.s_input : "";
+      this.parmValue.company_name = this.select === "company_name" ? this.s_input : "";
       this.parmValue.apply_name =
         this.select === "apply_name" ? this.s_input : "";
       await this.searchList();

src/views/purchaseIn/purchaseOrder/columns.js

@@ -160,6 +160,11 @@ const columns = [
     label: "采购供应商名称",
     width: "155px",
   },
+  {
+    prop: "company_name",
+    label: "采购员部门",
+    minWidth: "100px",
+  },
   {
     prop: "cgder",
     label: "采购员",

src/views/purchaseIn/purchaseOrder/detail.vue

@@ -193,6 +193,14 @@
                       min-width="180px"
                     >
                     </el-table-column>
+
+                    <el-table-column
+                      prop="receipt_quantity"
+                      label="发货数量"
+                      show-overflow-tooltip
+                      min-width="180px"
+                    >
+                    </el-table-column>
                   </el-table>
                 </template>
               </show-data-table>

src/views/purchaseIn/purchaseOrder/index.vue

@@ -168,6 +168,8 @@
                     <el-option label="采购员" value="6"></el-option>
                     <el-option label="采购供应商编号" value="7"></el-option>
                     <el-option label="订单编号" value="8"></el-option>
+                    <el-option label="采购员部门" value="9"></el-option>
+
                   </el-select>
                 </el-input>
               </el-col>
@@ -325,6 +327,7 @@ export default {
         page: 1, // 页码
         size: 15, // 每页显示条数
         supplierNo: "",
+        company_name:"", //部门
         wsm_supplierNo: "",
       },
       tableData: [],
@@ -554,6 +557,7 @@ export default {
         last_start: "", //最后入库时间开始
         last_end: "", //最后入库时间结束
         orderCode:"",//订单编号
+        company_name:"", //部门
         page: 1, // 页码
         size: 15, // 每页显示条数
       };
@@ -637,6 +641,7 @@ export default {
       this.parmValue.apply_name = this.select === "6" ? this.input : ""; // 申请人
       this.parmValue.supplierNo = this.select === "7" ? this.input : ""; // 采购供应商编号
       this.parmValue.orderCode = this.select === "8" ? this.input : ""; // 采购供应商编号
+      this.parmValue.company_name = this.select === "9" ? this.input : ""; // 部门
       console.log(this.pageInfo);
       // this.wsm_supplierNo = [];
       const res = await asyncRequest.list(this.parmValue);

src/views/purchaseIn/recovery/columns.js

@@ -42,6 +42,11 @@ const columns = [
     label: "单位",
     width: "60px",
   },
+  {
+    prop: "company_name",
+    label: "采购员部门",
+    minWidth: "150px",
+  },
   {
     prop: "creater",
     label: "采购员",

src/views/purchaseIn/recovery/index.vue

@@ -26,7 +26,7 @@
         <template #table-header="{}">
           <div style="width: 100%">
             <el-row style="padding: 0 0 0 80px">
-              <el-col :span="6" style="width: 240px">
+              <el-col :span="6" style="width: 200px">
                 <el-input
                   clearable
                   placeholder="咨询单编号"
@@ -41,7 +41,7 @@
                 >
                 </el-input>
               </el-col>
-              <el-col :span="6" style="width: 26s0px; padding: 0 0 0 10px">
+              <el-col :span="6" style="width: 200px; padding: 0 0 0 10px">
                 <el-input
                   clearable
                   placeholder="反馈编号"
@@ -56,6 +56,21 @@
                 >
                 </el-input>
               </el-col>
+               <el-col :span="6" style="width: 150px; padding: 0 0 0 10px">
+                <el-input
+                  clearable
+                  placeholder="采购员部门"
+                  v-model="parmValue.company_name"
+                  maxlength="40"
+                  :size="searchSize"
+                  @blur="
+                    pageInfo.curr = 1;
+                    parmValue.page = 1;
+                    searchList();
+                  "
+                >
+                </el-input>
+              </el-col>
 
               <el-col :span="4" style="width: 66px; float: right">
                 <el-button
@@ -160,6 +175,7 @@ export default {
         infoNo: "",
         bidNo: "",
         is_own: "1",
+        company_name:"", //部门
         page: 1, // 页码
         size: 15, // 每页显示条数
       },
@@ -192,6 +208,7 @@ export default {
         infoNo: "",
         bidNo: "",
         is_own: "1",
+        company_name:"", //部门
         page: 1, // 页码
         size: 15, // 每页显示条数
       };

src/views/purchaseIn/workbench/index.vue

@@ -15,7 +15,7 @@
               :key="item"
               @click="wantTo(item.infoNo)"
               :style="
-                item.is_feed == 1 ? 'background: skyblue;' : 'background:none;'
+                item.is_feed == 1 ? 'background: skyblue;' : 'background:#facd91;'
               "
             >
               <ul class="fl item-ul">

src/views/purchaseIn/wsmInOrder/columns.js

@@ -148,7 +148,11 @@ export default [
     label: "仓库名称",
     width: "80px",
   },
-
+  {
+    prop: "company_name",
+    label: "申请人部门",
+    minWidth: "150px",
+  },
   {
     prop: "apply_name",
     label: "申请人",

src/views/purchaseIn/wsmInOrder/index.vue

@@ -166,6 +166,8 @@
                     <el-option label="产品名称" value="5"></el-option>
                     <el-option label="申请人" value="6"></el-option>
                     <el-option label="采购供应商编号" value="7"></el-option>
+                    <el-option label="申请人部门"  value="8"></el-option>
+
                   </el-select>
                   <el-button
                     slot="append"
@@ -342,6 +344,7 @@ export default {
         page: 1, // 页码
         size: 15, // 每页显示条数
         supplierNo: "",
+        company_name:"", //部门
         wsm_supplierNo: "",
       },
       tableData: [],
@@ -444,6 +447,7 @@ export default {
         end: "", // 新建结束时间
         last_start: "", //最后入库时间开始
         last_end: "", //最后入库时间结束
+        company_name:"", //部门
         page: 1, // 页码
         size: 15, // 每页显示条数
       };
@@ -517,6 +521,7 @@ export default {
       this.parmValue.good_name = this.select === "5" ? this.input : ""; // 产品名称
       this.parmValue.apply_name = this.select === "6" ? this.input : ""; // 申请人
       this.parmValue.supplierNo = this.select === "7" ? this.input : ""; // 采购供应商编号
+      this.parmValue.company_name = this.select === "8" ? this.input : ""; // 部门
       // this.wsm_supplierNo = [];
       let model = JSON.parse(JSON.stringify(this.parmValue));
 
@@ -535,6 +540,7 @@ export default {
         status: model.status,
         page: model.page,
         size: model.size,
+        company_name:model.company_name,
       };
       const res = await asyncRequest.list(_model);
       if (res && res.code === 0 && res.data) {

src/views/reportQuery/purchaseReport/components/columns.js

@@ -128,10 +128,15 @@ const table4 = [
     label: "采购日期",
     minWidth: "155px",
   },
+  {
+    prop: "name",
+    label: "采购员所属部门",
+    minWidth: "150px",
+  },
   {
     prop: "cgder",
     label: "采购员",
-    minWidth: "155px",
+    minWidth: "105px",
   },
   {
     prop: "good_num",
@@ -206,17 +211,27 @@ const table5 = [
   {
     prop: "delivery_day",
     label: "物流时间（天）",
-    minWidth: "95px",
+    minWidth: "115px",
   },
   {
     prop: "work_day",
     label: "商品工期（天）",
-    minWidth: "95px",
+    minWidth: "115px",
   },
   {
     prop: "expire_day",
     label: "信息有效期（天）",
-    minWidth: "95px",
+    minWidth: "125px",
+  },
+  {
+    prop: "name",
+    label: "采购员所属部门",
+    minWidth: "150px",
+  },
+  {
+    prop: "salesman_name",
+    label: "业务人员所属部门",
+    minWidth: "150px",
   },
   {
     prop: "creater",
@@ -359,6 +374,11 @@ const table7 = [
     label: "未发货数量",
     minWidth: "110px",
   },
+  {
+    prop: "creater_name",
+    label: "创建人所属部门",
+    minWidth: "140px",
+  },
   {
     prop: "creater",
     label: "创建人",
@@ -369,6 +389,16 @@ const table7 = [
     label: "客户名称",
     minWidth: "155px",
   },
+  {
+    prop: "is_stock",
+    label: "商品库存性质",
+    minWidth: "110px",
+  },
+  {
+    prop: "name",
+    label: "采购员所属部门",
+    minWidth: "150px",
+  },
   {
     prop: "cgder",
     label: "采购员",
@@ -411,6 +441,17 @@ const table8 = [
     label: "采购单编号",
     minWidth: "155px",
   },
+
+  {
+    prop: "name",
+    label: "采购员所属部门",
+    minWidth: "150px",
+  },
+  {
+    prop: "cgder",
+    label: "采购员",
+    minWidth: "110px",
+  },
   {
     prop: "supplier_name",
     label: "供应商名称",
@@ -482,6 +523,11 @@ const table9 = [
     label: "供应商名称",
     minWidth: "155px",
   },
+  {
+    prop: "company_name",
+    label: "采购维护人所属部门",
+    minWidth: "155px",
+  },
   {
     prop: "creater",
     label: "采购维护人",
@@ -558,6 +604,17 @@ const table10 = [
     label: "购买数量",
     minWidth: "105px",
   },
+  {
+    prop: "is_stock",
+    label: "商品库存性质",
+    minWidth: "110px",
+    _slot_:"isStock",
+  },
+  {
+    prop: "name",
+    label: "采购员所属部门",
+    minWidth: "150px",
+  },
   {
     prop: "cgder",
     label: "采购员",
@@ -599,6 +656,11 @@ const table11 = [
     fixed: "left",
     _noset_: true
   },
+  {
+    prop: "company_name",
+    label: "采购维护人所属部门",
+    minWidth: "155px",
+  },
   {
     prop: "creater",
     label: "采购维护人",
@@ -670,6 +732,11 @@ const table12 = [
     label: "商品下线时间",
     minWidth: "155px",
   },
+  {
+    prop: "company_name",
+    label: "采购维护人所属部门",
+    minWidth: "155px",
+  },
   {
     prop: "creater",
     label: "采购维护人",
@@ -715,6 +782,11 @@ const table13 = [
     label: "商品操作时间",
     minWidth: "155px",
   },
+  {
+    prop: "company_name",
+    label: "采购维护人所属部门",
+    minWidth: "155px",
+  },
   {
     prop: "creater",
     label: "采购维护人",

src/views/reportQuery/purchaseReport/components/table10.vue

@@ -105,6 +105,10 @@
         <template #is_th="{ scope }">
           <span>{{ scope.row.is_th == 1 ? '可以' : '不可以' }}</span>
         </template>
+<template #isStock="{ scope }">
+          <span>{{ scope.row.is_stock == 1 ? '库存品' : '非库存品' }}</span>
+        </template>
+        
       </ex-table>
     </div>
 

src/views/reportQuery/saleReport/index.vue

@@ -1,15 +1,68 @@
 <template>
-    <div>
-        222销售
-    </div>
+  <div>222销售</div>
 </template>
 
 <script>
 export default {
+  data() {
+    return {
+      obj: {
+        name: "测试",
+        age: 2,
+      },
+      obj2: {
+        sex: "男",
+      },
+      arr: [1, 2],
+      arr2: [3, 4, 2],
+    };
+  },
+  mounted() {
+    this.test();
+  },
+  methods: {
+    test() {
+    //   let { name, age } = this.obj;
+      // console.log(name)
 
-}
+      // let obj = {...this.obj,...this.obj2}
+      // console.log(obj)
+
+      // let str = `${age>0?'ok':'no'}`
+      // console.log(str)
+
+      // if(this.arr.includes(1)){
+      //     console.log("ok")
+      // }
+
+    //   const deps = {
+    //     采购部: [1, 2, 3],
+    //     人事部: [5, 8, 12],
+    //     行政部: [5, 14, 79],
+    //     运输部: [3, 64, 105],
+    //   };
+    //   console.log(Object.values(deps).flat());
+
+    
+   
+    // let a = '';
+
+    // if(a??'' !==""){
+
+    //     alert(111)
+    // }else{
+    //     alert("iusadhaiusd")
+    // }
+
+
+
+
+    },
+
+
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-
 </style>

src/views/sellOut/bargainList/columns.js

@@ -410,6 +410,11 @@ const listCol = [
   //   width: 110,
 
   // },
+  {
+    prop: "company_name",
+    label: "申请人部门",
+    minWidth: "150px",
+  },
 
   {
     prop: "creater",

src/views/sellOut/bargainList/index.vue

@@ -80,6 +80,8 @@
                     <el-option label="议价单编号" value="1" />
                     <el-option label="反馈商品编号" value="2" />
                     <el-option label="咨询单编号" value="3" />
+                    <el-option label="申请人部门" value="4" />
+
                   </el-select>
                   <el-button
                     slot="append"
@@ -212,6 +214,7 @@ export default {
         end: "",
         page: 1, // 页码
         size: 15, // 每页显示条数
+        company_name:"",
       },
       // 表格 - 数据
       tableData: [],
@@ -300,6 +303,7 @@ export default {
         end: "",
         page: 1, // 页码
         size: 15, // 每页显示条数
+        company_name:"",
       };
       // 表格 - 分页
       this.pageInfo = {
@@ -358,6 +362,7 @@ export default {
       this.parmValue.bargainNo = this.select === "1" ? this.s_input : "";
       this.parmValue.bidsNo = this.select === "2" ? this.s_input : "";
       this.parmValue.infoNo = this.select === "3" ? this.s_input : "";
+      this.parmValue.company_name = this.select === "4" ? this.s_input : "";
       const res = await asyncRequest.list(this.parmValue);
       if (res && res.code === 0 && res.data) {
         this.tableData = res.data.list;

src/views/sellOut/project/columns.js

@@ -54,6 +54,11 @@ export default [
     label: "业务公司",
     'min-width': "130px",
   },
+  {
+    prop: "company_name",
+    label: "申请人部门",
+    minWidth: "150px",
+  },
   {
     prop: "creater",
     label: "申请人",

src/views/sellOut/project/index.vue

@@ -95,7 +95,7 @@
             </el-row>
             <el-row style="padding: 10px 0 0 0">
               <el-col :span="24">
-                <el-col :span="4" style="width: 365px">
+                <el-col :span="4" style="width: 355px">
                   <search-customer
                     :value="customerCode"
                     :size="searchSize"
@@ -105,7 +105,7 @@
                     @searchChange="customerChange"
                   />
                 </el-col>
-                <el-col :span="4" style="width: 350px; padding: 0 0 0 10px">
+                <el-col :span="4" style="width: 320px; padding: 0 0 0 10px">
                   <el-input
                     placeholder="项目名称"
                     v-model="parmValue.project_name"
@@ -120,6 +120,21 @@
                   </el-input>
                 </el-col>
 
+                <el-col :span="4" style="width: 170px; padding: 0 0 0 10px">
+                  <el-input
+                    placeholder="申请人部门"
+                    v-model="parmValue.company_name"
+                    :size="searchSize"
+                    maxlength="100"
+                    @blur="
+                      pageInfo.curr = 1;
+                      parmValue.page = 1;
+                      searchList();
+                    "
+                  >
+                  </el-input>
+                </el-col>
+
                 <el-col
                   :span="3"
                   class="fr"
@@ -236,6 +251,7 @@ export default {
         project_name: "",
         low: "",
         up: "",
+        company_name:"",
       },
       tableData: [],
       passwordModel: false,
@@ -349,6 +365,7 @@ export default {
         project_name: "",
         low: "",
         up: "",
+        company_name:"",
       };
       this.searchList();
     },

src/views/sellOut/salesOrder/columns.js

@@ -74,6 +74,11 @@ export default [
     label: "销售方公司",
     width: "125px",
   },
+  {
+    prop: "company_name",
+    label: "创建人部门",
+    minWidth: "100px",
+  },
 
   {
     prop: "apply_name",

src/views/sellOut/salesOrder/detail.vue

@@ -89,7 +89,13 @@
                     ><span
                       >{{
                         sitem.is_activity === "1" ? "参与活动" : "不参与活动"
-                      }}/{{ sitem.good_type }}</span
+                      }}/{{
+                        (
+                          goodtype_options.find(
+                            (item) => item.value == sitem.good_type
+                          ) || {}
+                        ).label || "--"
+                      }}</span
                     ></span
                   >
                   <span v-else>--</span>
@@ -223,6 +229,20 @@ export default {
       activeNames: ["-1", "0", "1", "2", "3", "4", "5", "6"],
       showColumns: showColumns,
       setShowModel: false,
+      goodtype_options: [
+        {
+          value: "1",
+          label: "常规商品",
+        },
+        {
+          value: "2",
+          label: "赠品",
+        },
+        {
+          value: "3",
+          label: "样品",
+        },
+      ],
       orderOptions: [
         { id: "1", label: "线上商品销售" },
         { id: "2", label: "项目线上商品销售" },

src/views/sellOut/salesOrder/index.vue

@@ -157,7 +157,8 @@
                       value="customer_code"
                     ></el-option> -->
                     <el-option label="商品名称" value="good_name"></el-option>
-                    <el-option label="申请人" value="apply_name"></el-option>
+                    <el-option label="创建人" value="apply_name"></el-option>
+                    <el-option label="创建人部门" value="company_name"></el-option>
                   </el-select>
                 </el-input>
               </el-col>
@@ -322,6 +323,8 @@ export default {
         customer_code: "", //客户编号
         start: "", //新建起始时间
         end: "", // 新建结束时间
+        company_name:"", //创建人部门
+
       },
       // 表格 - 数据
       tableData: [],
@@ -413,6 +416,7 @@ export default {
         customer_code: "", //客户编号
         start: "", //新建起始时间
         end: "", // 新建结束时间
+        company_name:"", //部门
       };
       // 表格 - 分页
       this.pageInfo = {
@@ -494,6 +498,9 @@ export default {
       this.parmValue.good_name = this.select === "good_name" ? this.input : "";
       this.parmValue.apply_name =
         this.select === "apply_name" ? this.input : "";
+
+      this.parmValue.company_name = this.select === "company_name" ? this.input : "";
+
       const res = await asyncRequest.list(this.parmValue);
       if (res && res.code === 0 && res.data) {
         this.tableData = res.data.list;

src/views/sellOut/sellAfterApply/columns.js

@@ -4,6 +4,11 @@ const columns = [
     label: "售后申请单",
     width: "160"
   },
+  {
+    prop: "company_name",
+    label: "申请人部门",
+    minWidth: "150px",
+  },
   {
     prop: "apply_name",
     label: "申请人",

src/views/sellOut/sellAfterApply/index.vue

@@ -135,7 +135,8 @@
 
                     <el-option label="商品编号" value="goodsNum"></el-option>
                     <el-option label="商品名称" value="goodsName"></el-option>
-
+                    <el-option label="申请人部门" value="company_name"></el-option>
+                    
                     <el-option label="申请人" value="applyer"></el-option>
                   </el-select>
                   <el-button
@@ -299,6 +300,7 @@ export default {
         apply_name: "", //申请人名称
         good_name: "", //商品名称
         except_code: "", //期望意愿
+        company_name:"", //申请人部门
         page: 1, // 页码
         size: 15, // 每页显示条数
       },
@@ -374,6 +376,7 @@ export default {
         outCode: "",
         good_name: "", //商品名称
         except_code: "", //期望意愿
+        company_name:"", //申请人部门
         page: 1, // 页码
         size: 15, // 每页显示条数
       };
@@ -439,6 +442,8 @@ export default {
       this.parmValue.orderCode =
         this.select === "sellOrderNum" ? this.s_input : ""; // 备库编码
       this.parmValue.outCode = this.select === "sellOutNum" ? this.s_input : ""; // 申请人
+      this.parmValue.company_name = this.select === "company_name" ? this.s_input : ""; // 申请人部门
+
       let model = JSON.parse(JSON.stringify(this.parmValue));
       const res = await asyncRequest.list(model);
       if (res && res.code === 0 && res.data) {

src/views/sellOut/sellOutOrder/columns.js

@@ -20,6 +20,12 @@ const columns = [
     label: "采购单编号",
     width: "156"
   },
+  {
+    prop: "company_name",
+    label: "申请人部门",
+    minWidth: "150px",
+  },
+
   {
     prop: "apply_name",
     label: "申请人",

src/views/sellOut/sellOutOrder/index.vue

@@ -121,6 +121,7 @@
                     <!-- <el-option label="供应商编号" value="supplierNo" /> -->
                     <el-option label="商品编号" value="good_code" />
                     <el-option label="商品名称" value="good_name" />
+                    <el-option label="申请人部门" value="company_name" />
                     <el-option label="申请人" value="apply_name" />
                     <el-option label="采购单编号" value="cgdNo" />
                   </el-select>
@@ -293,6 +294,7 @@ export default {
         good_name: "",
         outCode: "",
         status: "",
+        company_name:"", //申请人部门
         page: 1, // 页码
         size: 15, // 每页显示条数
       },
@@ -456,6 +458,7 @@ export default {
         good_name: "",
         outCode: "",
         status: "",
+        company_name:"", //申请人部门
         page: 1, // 页码
         size: 15, // 每页显示条数
       };
@@ -611,6 +614,8 @@ export default {
       this.parmValue.apply_name =
         this.select === "apply_name" ? this.s_input : "";
       this.parmValue.cgdNo = this.select === "cgdNo" ? this.s_input : "";
+      this.parmValue.company_name = this.select === "company_name" ? this.s_input : "";
+
       await this.searchList();
     },
   },

src/views/sellOut/sellReturn/columns.js

@@ -51,7 +51,11 @@ export default [
   //   label: "退货总金额",
   //   width: "120"
   // },
-
+  {
+    prop: "company_name",
+    label: "申请人部门",
+    minWidth: "150px",
+  },
   {
     prop: "apply_name",
     label: "申请人",

src/views/sellOut/sellReturn/index.vue

@@ -65,7 +65,7 @@
                     clearable
                     placeholder="关键字"
                     v-model="s_input"
-                     maxlength="40"
+                    maxlength="40"
                     :size="searchSize"
                     class="input-with-select"
                   >
@@ -77,6 +77,8 @@
                     >
                       <el-option label="销售退货单编号" value="returnCode" />
                       <el-option label="销售订单编号" value="orderCode" />
+                      <el-option label="申请人部门" value="company_name" />
+
                       <el-option label="申请人" value="apply_name" />
                     </el-select>
                     <el-button
@@ -139,8 +141,7 @@
           >
             <i
               class="el-icon-view tb-icon"
-              
-               @click="getRouter('sellReturnDetail', scope.row.returnCode )"
+              @click="getRouter('sellReturnDetail', scope.row.returnCode)"
             ></i>
           </el-tooltip>
         </template>
@@ -197,6 +198,7 @@ export default {
       parmValue: {
         returnCode: "", //销售退货code
         orderCode: "", //销售订单code
+        company_name: "",
         apply_name: "", //申请人
         start: "",
         end: "",
@@ -231,33 +233,32 @@ export default {
     const { back } = this.$route.query;
     if (back) {
       this.parmValue = JSON.parse(back);
-      console.log(this.parmValue)
-      const {page,size}=this.parmValue;
+      console.log(this.parmValue);
+      const { page, size } = this.parmValue;
       // this.parmValue.start = start || last_start;
       // this.parmValue.end = end || last_end;
       // if(this.parmValue.companyNo.length>0){
       //     this.customerCode = [this.parmValue.companyNo] ;
       // }
-      
-       this.pageInfo= {
+
+      this.pageInfo = {
         size: size,
         curr: page,
         total: 0,
-      }
+      };
       //多选条件
-    this.select = this.parmValue.select;
-    // this.sselect = this.parmValue.sselect;
-    this.s_input = this.parmValue.s_input
-
-    }else{
-       this.select = "returnCode";
+      this.select = this.parmValue.select;
+      // this.sselect = this.parmValue.sselect;
+      this.s_input = this.parmValue.s_input;
+    } else {
+      this.select = "returnCode";
       //  this.sselect = "创建时间"
     }
     this.searchList();
   },
 
   methods: {
-    getRouter(toRouter, queryId){
+    getRouter(toRouter, queryId) {
       if (toRouter && queryId) {
         let model = {
           id: queryId,
@@ -265,16 +266,16 @@ export default {
         };
 
         //有多选框的条件
-        this.parmValue.select = this.select ;
+        this.parmValue.select = this.select;
         // this.parmValue.sselect = this.sselect ;
-        this.parmValue.s_input= this.s_input;
+        this.parmValue.s_input = this.s_input;
         //
-         let routerModel = {
+        let routerModel = {
           options: JSON.parse(JSON.stringify(this.parmValue)),
           router: this.$route.path,
         };
         model.preModel = JSON.stringify(routerModel);
-        
+
         this.routeGoto(toRouter, model);
       } else {
         this.$message.warning("暂未找到相关流程！");
@@ -285,6 +286,7 @@ export default {
       this.select = ""; //清除下拉框选中项
       this.parmValue = {
         order_type: "1", //订单类型1为销售 2为咨询
+        company_name: "", //申请人部门
 
         returnCode: "", //销售退货code
         orderCode: "", //销售订单code
@@ -339,7 +341,7 @@ export default {
         });
     },
     async searchList() {
-       if (
+      if (
         (this.parmValue.start !== "" && this.parmValue.end === "") ||
         (this.parmValue.start === "" && this.parmValue.end !== "")
       ) {
@@ -353,6 +355,8 @@ export default {
         this.select === "orderCode" ? this.s_input : "";
       this.parmValue.apply_name =
         this.select === "apply_name" ? this.s_input : "";
+      this.parmValue.company_name =
+        this.select === "company_name" ? this.s_input : "";
       let model = JSON.parse(JSON.stringify(this.parmValue));
 
       const res = await asyncRequest.list(model);

src/views/sellOut/stockApply/columns.js

@@ -4,6 +4,12 @@ const columns = [
     label: "申请编码",
     width: "160"
   },
+  {
+    prop: "company_name",
+    label: "申请人部门",
+    minWidth: "150px",
+  },
+
   {
     prop: "apply_name",
     label: "申请人",

src/views/sellOut/stockApply/index.vue

@@ -100,6 +100,7 @@
                     <el-option label="商品属性编号" value="2" />
                     <el-option label="商品名称" value="3" />
                     <el-option label="申请人" value="4" />
+                    <el-option label="申请人部门" value="5" />
                   </el-select>
                   <el-button
                     slot="append"
@@ -222,6 +223,7 @@ export default {
         good_name: "",
         page: 1,
         size: 15,
+        company_name:"",
       },
       // 表格 - 数据
       tableData: [],
@@ -324,6 +326,7 @@ export default {
         bk_code: "", //备库编号
         page: 1, // 页码
         size: 15, // 每页显示条数
+        company_name:"",
       };
       // 表格 - 分页
       this.pageInfo = {
@@ -348,6 +351,7 @@ export default {
       this.parmValue.good_code = this.select === "2" ? this.input : "";
       this.parmValue.good_name = this.select === "3" ? this.input : "";
       this.parmValue.apply_name = this.select === "4" ? this.input : "";
+      this.parmValue.company_name = this.select === "5" ? this.input : "";
       const res = await asyncRequest.list(this.parmValue);
       if (res && res.code === 0 && res.data) {
         this.tableData = res.data.list;

src/views/sellOut/zixunOrder/columns.js

@@ -584,6 +584,11 @@ const listCol = [
     label: "咨询数量",
     width: 110,
   },
+  {
+    prop: "company_name",
+    label: "申请人部门",
+    minWidth: "150px",
+  },
   {
     prop: "creater",
     label: "申请人",

src/views/sellOut/zixunOrder/index.vue

@@ -113,6 +113,7 @@
                     <el-option label="咨询单编号" value="1" />
                     <el-option label="商品名称" value="2" />
                     <el-option label="申请人" value="3" />
+                    <el-option label="申请人部门" value="4" />
                   </el-select>
                 </el-input>
               </el-col>
@@ -269,6 +270,7 @@ export default {
         end: "",
         page: 1, // 页码
         size: 15, // 每页显示条数
+        company_name:"",
       },
       // 表格 - 数据
       tableData: [],
@@ -355,6 +357,7 @@ export default {
         end: "",
         page: 1, // 页码
         size: 15, // 每页显示条数
+        company_name:"",
       };
       // 表格 - 分页
       this.pageInfo = {
@@ -388,6 +391,7 @@ export default {
       model.zxNo = this.select === "1" ? this.s_input : "";
       model.cpName = this.select === "2" ? this.s_input : "";
       model.salesman = this.select === "3" ? this.s_input : "";
+      model.company_name = this.select === "4" ? this.s_input : "";
 
       const res = await asyncRequest.list(model);
       if (res && res.code === 0 && res.data) {

src/views/serviceParam/Invoicing/index.vue

@@ -113,6 +113,8 @@
                     <el-option label="发票抬头" value="invoice_title" />
                     <el-option label="企业客户名称" value="companyName" />
                     <el-option label="创建人" value="creater" />
+                    <el-option label="创建人部门" value="company_name"/>
+
                   </el-select>
                 </el-input>
               </el-col>
@@ -296,6 +298,7 @@ export default {
         name: "", // 业务员名字
         username: "", // 账号
         status: "", //
+        company_name: "", //创建人部门
         page: 1, // 页码
         size: 15, // 每页显示条数
       },
@@ -351,6 +354,11 @@ export default {
           _slot_: "status",
           width: "70px",
         },
+        {
+          prop: "company_name",
+          label: "创建人部门",
+          minWidth: "150px",
+        },
         {
           prop: "creater",
           label: "创建人",
@@ -396,6 +404,7 @@ export default {
         name: "", // 业务员名字
         username: "", // 账号
         status: "", //
+        company_name: "", //创建人部门
         page: 1, // 页码
         size: 15, // 每页显示条数
       };
@@ -465,6 +474,7 @@ export default {
       this.parmValue.invoice_title = "";
       this.parmValue.companyName = "";
       this.parmValue.creater = "";
+      this.parmValue.company_name = "";
       this.parmValue[this.select] = this.sinput;
       const res = await asyncRequest.list(this.parmValue);
       if (res && res.code === 0 && res.data) {

src/views/serviceParam/business/index.vue

@@ -64,6 +64,7 @@
               <el-option label="组织/企业名称" value="1"></el-option>
               <el-option label="企业编号" value="2"></el-option>
               <el-option label="创建人" value="3"></el-option>
+              <el-option label="创建人部门" value="4"></el-option>
             </el-select>
             <el-button
               slot="append"
@@ -90,7 +91,7 @@
         </el-col>
       </el-row>
       <el-table
-        v-loading="false"
+        v-loading="loading"
         :data="tableData"
         :size="size"
         border
@@ -127,6 +128,13 @@
             ></el-tag>
           </template>
         </el-table-column>
+        <el-table-column
+          prop="company_name"
+          label="创建人部门"
+          width="150"
+          show-overflow-tooltip
+        >
+        </el-table-column>
         <el-table-column
           prop="creater"
           label="创建人"
@@ -286,6 +294,7 @@ export default {
         pid: "",
         creater: "",
         start: "",
+        company_name: "", //创建人部门
         end: "",
         companyNo: "",
       },
@@ -340,6 +349,7 @@ export default {
         name: "",
         pid: "",
         creater: "",
+        company_name: "", //创建人部门
         start: "",
         end: "",
         companyNo: "",
@@ -440,6 +450,7 @@ export default {
       this.parmValue.name = this.select === "1" ? this.sinput : "";
       this.parmValue.companyNo = this.select === "2" ? this.sinput : "";
       this.parmValue.creater = this.select === "3" ? this.sinput : "";
+      this.parmValue.company_name = this.select === "4" ? this.sinput : "";
       const res = await asyncRequest.list(this.parmValue);
       if (res && res.code === 0 && res.data) {
         this.tableData = res.data;

src/views/serviceParam/exclusive/index.vue

@@ -94,6 +94,19 @@
                 placeholder="专属类型名称"
               ></el-input>
             </el-col>
+            <el-col :span="4" style="width: 170px; padding: 0 0 0 10px">
+              <el-input
+                :size="searchSize"
+                v-model="parmValue.company_name"
+                :maxlength="40"
+                @change="
+                  pageInfo.curr = 1;
+                  parmValue.page = 1;
+                  searchList();
+                "
+                placeholder="创建人部门"
+              ></el-input>
+            </el-col>
 
             <el-col
               :span="3"
@@ -207,13 +220,12 @@
       @refresh="searchList"
       @cancel="showModel = false"
     />
-   
   </div>
 </template>
 <script>
 import addEdit from "./addEdit";
 import asyncRequest from "@/apis/service/serviceParam/exclusive";
-import {statusList} from "@/assets/js/statusList";
+import { statusList } from "@/assets/js/statusList";
 import roleLevel from "@/assets/js/roleLevel";
 import mixinPage from "@/mixins/elPaginationHandle";
 import { mapGetters } from "vuex";
@@ -229,8 +241,9 @@ export default {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
       let tran =
-        this.$store.getters.btnList.find((item) => item.menu_route == "exclusive") ||
-        {};
+        this.$store.getters.btnList.find(
+          (item) => item.menu_route == "exclusive"
+        ) || {};
       if (tran && tran.action && tran.action.length > 0) {
         return tran.action;
       } else {
@@ -251,6 +264,7 @@ export default {
         page: 1, // 页码
         size: 15, // 每页显示条数
         status: "",
+        company_name: "", //创建人部门
         cat_name: "",
         pid: "0",
       },
@@ -278,33 +292,38 @@ export default {
         {
           prop: "id",
           label: "ID",
-          width:"80px"
+          width: "80px",
         },
         {
           prop: "name",
           label: "专属类型名称",
-          'min-width': "130px",
+          "min-width": "130px",
         },
         {
           prop: "status",
           label: "状态",
           _slot_: "status",
-         'min-width': "70px",
+          "min-width": "70px",
         },
         {
           prop: "level",
           label: "等级",
-         'min-width': "70px",
+          "min-width": "70px",
+        },
+        {
+          prop: "company_name",
+          label: "创建人部门",
+          minWidth: "150px",
         },
         {
           prop: "creater",
           label: "创建人",
-          'min-width': "70px",
+          "min-width": "70px",
         },
         {
           prop: "addtime",
           label: "创建时间",
-         'min-width': "145px",
+          "min-width": "145px",
         },
         {
           prop: "",
@@ -334,6 +353,7 @@ export default {
         page: 1, // 页码
         size: 15, // 每页显示条数
         status: "",
+        company_name: "", //创建人部门
         pid: "0",
         cat_name: "",
       };
@@ -357,7 +377,7 @@ export default {
       };
       this.titleList.push(model);
     },
-  
+
     // 新建/编辑/详情
     openModal(row, type) {
       const { status } = row;

src/views/serviceParam/orderuse/index.vue

@@ -103,6 +103,19 @@
                 placeholder="创建人"
               ></el-input>
             </el-col>
+            <el-col :span="4" style="width: 170px; padding: 0 0 0 10px">
+              <el-input
+                :size="searchSize"
+                v-model="parmValue.company_name"
+                :maxlength="40"
+                @change="
+                  pageInfo.curr = 1;
+                  parmValue.page = 1;
+                  searchList();
+                "
+                placeholder="创建人部门"
+              ></el-input>
+            </el-col>
             <el-col
               :span="3"
               class="fr"
@@ -249,6 +262,7 @@ export default {
         end: "",
         order_use:"",
         status: "",
+        company_name: "", //创建人部门
         creater: "",
       },
       // 状态
@@ -291,6 +305,11 @@ export default {
           prop: "creater",
           label: "创建人",
         },
+        {
+          prop: "company_name",
+          label: "创建人部门",
+          minWidth: "150px",
+        },
         {
           prop: "addtime",
           label: "创建时间",
@@ -324,6 +343,7 @@ export default {
         end: "",
         order_use:"",
         status: "",
+        company_name: "", //创建人部门
         creater: "",
       };
       this.searchList();

src/views/serviceParam/parameter/index.vue

@@ -103,6 +103,19 @@
                 placeholder="创建人"
               ></el-input>
             </el-col>
+            <el-col :span="4" style="width: 170px; padding: 0 0 0 10px">
+              <el-input
+                :size="searchSize"
+                v-model="parmValue.company_name"
+                :maxlength="40"
+                @change="
+                  pageInfo.curr = 1;
+                  parmValue.page = 1;
+                  searchList();
+                "
+                placeholder="创建人部门"
+              ></el-input>
+            </el-col>
             <el-col
               :span="3"
               class="fr"
@@ -247,6 +260,7 @@ export default {
         size: 15, // 每页显示条数
         start: "",
         end: "",
+        company_name: "", //创建人部门
         status: "",
         creater: "",
       },
@@ -286,6 +300,11 @@ export default {
           _slot_: "status",
         },
         {
+    prop: "company_name",
+    label: "创建人部门",
+    minWidth: "150px",
+  },
+        {
           prop: "creater",
           label: "创建人",
         },
@@ -320,6 +339,7 @@ export default {
         size: 15, // 每页显示条数
         start: "",
         end: "",
+        company_name: "", //创建人部门
         status: "",
         creater: "",
       };

src/views/serviceParam/storeSet/index.vue

@@ -4,7 +4,7 @@
       v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
     >
       <ex-table
-        v-loading="false"
+        v-loading="loading"
         :table="table"
         :data="tableData"
         :columns="columns"
@@ -124,6 +124,7 @@
                     <el-option label="仓库编码" value="1"></el-option>
                     <el-option label="负责人姓名" value="2"></el-option>
                     <el-option label="负责人手机号" value="3"></el-option>
+                    <el-option label="负责人部门" value="4"></el-option>
                   </el-select>
                   <el-button
                     slot="append"
@@ -305,6 +306,7 @@ export default {
       supplierNo: [], //供应商
       stock_sn: "", //企业/仓库编码
       stock_name: "", //企业/仓库名称
+        company_new_name: "", //负责人部门
       link: "", //联系电话/联系人
       loading: true,
       showModel: false,
@@ -370,6 +372,11 @@ export default {
           // sortable: true,
           _slot_: "status",
         },
+        {
+          prop: "company_new_name",
+          label: "负责人部门",
+          minWidth: "150px",
+        },
         {
           prop: "contactor_name",
           label: "负责人",
@@ -449,6 +456,7 @@ export default {
         wsm_code: "", //仓库编码
         wsm_type:"",
         start: "", //新建起始时间
+        company_new_name: "", //负责人部门
         end: "", //新建结束时间
         mobile: "", //手机号
         contactor_name: "", //联系人
@@ -475,6 +483,7 @@ export default {
       this.parmValue.wsm_code = this.select === "1" ? this.input : "";
       this.parmValue.contactor_name = this.select === "2" ? this.input : "";
       this.parmValue.mobile = this.select === "3" ? this.input : "";
+      this.parmValue.company_new_name = this.select === "4" ? this.input : "";
       const res = await asyncRequest.list(this.parmValue);
       if (res && res.code === 0 && res.data) {
         console.log("aaaaaaaaaaaaaaaa", res);

src/views/serviceParam/supplier/index.vue

@@ -99,7 +99,7 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="4" style="width: 373px">
+            <el-col :span="4" style="width: 333px">
               <el-input
                 :size="searchSize"
                 v-model="parmValue.name"
@@ -112,7 +112,7 @@
                 placeholder="供应商名称"
               ></el-input>
             </el-col>
-            <el-col :span="4" style="width: 170px; padding: 0 0 0 10px">
+            <el-col :span="4" style="width: 120px; padding: 0 0 0 10px">
               <el-input
                 :size="searchSize"
                 v-model="parmValue.creater"
@@ -126,6 +126,19 @@
               ></el-input>
             </el-col>
             <el-col :span="4" style="width: 170px; padding: 0 0 0 10px">
+              <el-input
+                :size="searchSize"
+                v-model="parmValue.company_name"
+                :maxlength="40"
+                @change="
+                  pageInfo.curr = 1;
+                  parmValue.page = 1;
+                  searchList();
+                "
+                placeholder="创建人部门"
+              ></el-input>
+            </el-col>
+            <el-col :span="4" style="width: 120px; padding: 0 0 0 10px">
               <el-input
                 :size="searchSize"
                 v-model="parmValue.person"
@@ -311,6 +324,7 @@ export default {
         end: "",
         status: "",
         creater: "",
+        company_name: "", //创建人部门
         name: "",
         ocr_status: "",
       },
@@ -372,6 +386,11 @@ export default {
           label: "负责人",
           width: "100",
         },
+        {
+          prop: "company_name",
+          label: "创建人部门",
+          minWidth: "150px",
+        },
         {
           prop: "creater",
           label: "创建人",
@@ -460,6 +479,7 @@ export default {
         start: "",
         end: "",
         status: "",
+        company_name: "", //创建人部门
         creater: "",
         name: "",
         person: "",

src/views/serviceParam/terrace/index.vue

@@ -103,6 +103,19 @@
                 placeholder="创建人"
               ></el-input>
             </el-col>
+            <el-col :span="4" style="width: 170px; padding: 0 0 0 10px">
+              <el-input
+                :size="searchSize"
+                v-model="parmValue.company_name"
+                :maxlength="40"
+                @change="
+                  pageInfo.curr = 1;
+                  parmValue.page = 1;
+                  searchList();
+                "
+                placeholder="创建人部门"
+              ></el-input>
+            </el-col>
             <el-col
               :span="3"
               class="fr"
@@ -247,6 +260,7 @@ export default {
         size: 15, // 每页显示条数
         start: "",
         end: "",
+        company_name: "", //创建人部门
         status: "",
         creater: "",
         platform_name: "",
@@ -294,6 +308,11 @@ export default {
           prop: "creater",
           label: "创建人",
         },
+        {
+          prop: "company_name",
+          label: "创建人部门",
+          minWidth: "150px",
+        },
         {
           prop: "addtime",
           label: "创建时间",
@@ -325,6 +344,7 @@ export default {
         start: "",
         end: "",
         status: "",
+        company_name: "", //创建人部门
         creater: "",
         platform_name: "",
       };

src/views/serviceParam/workCompany/index.vue

@@ -110,9 +110,22 @@
                     parmValue.page = 1;
                     searchList();
                   "
-                  placeholder="创建人"
+                  placeholder="负责人"
                 ></el-input>
               </el-col>
+              <el-col :span="4" style="width: 170px; padding: 0 0 0 10px">
+              <el-input
+                :size="searchSize"
+                v-model="parmValue.company_name"
+                :maxlength="40"
+                @change="
+                  pageInfo.curr = 1;
+                  parmValue.page = 1;
+                  searchList();
+                "
+                placeholder="负责人部门"
+              ></el-input>
+            </el-col>
               <el-col
                 :span="3"
                 class="fr"
@@ -259,6 +272,7 @@ export default {
         supplierNo: "", //供应商编码
         wsm_code: "", //仓库编码
         start: "", //新建起始时间
+        company_name: "", //负责人部门
         end: "", //新建结束时间
         mobile: "", //手机号
         contactor: "", //联系人
@@ -299,6 +313,11 @@ export default {
           width: "100px",
           _slot_: "status",
         },
+        {
+          prop: "company_name",
+          label: "负责人部门",
+          minWidth: "150px",
+        },
         {
           prop: "creater",
           label: "负责人",
@@ -358,6 +377,7 @@ export default {
         supplierNo: "", //供应商编码
         wsm_code: "", //仓库编码
         start: "", //新建起始时间
+        company_name: "", //负责人部门
         end: "", //新建结束时间
         mobile: "", //手机号
         contactor: "", //联系人

src/views/stock/allot/columns.js

@@ -11,6 +11,11 @@ export default [
     _slot_: "status",
     width: "130px",
   },
+  {
+    prop: "company_name",
+    label: "申请人部门",
+    minWidth: "150px",
+  },
   {
     prop: "apply_name",
     label: "申请人",

src/views/stock/allot/index.vue

@@ -25,9 +25,9 @@
       >
         <template #table-header="{}">
           <div style="width: 100%">
-            <el-row style="padding: 0 0 0 80px">
+            <el-row style="padding: 0px 0 0 80px">
               <el-col :span="24">
-                <el-col :span="4" style="width: 160px">
+                <el-col :span="4" style="width: 130px">
                   <el-select
                     v-model="parmValue.status"
                     :size="searchSize"
@@ -58,8 +58,20 @@
                     @timeReturned="handleTime"
                   />
                 </el-col>
-
-                <el-col :span="4" style="width: 235px; padding: 0 0 0 10px">
+                <el-col :span="4" style="width: 140px; padding: 0 0 0 10px">
+                  <el-input
+                    :size="searchSize"
+                    v-model="parmValue.company_name"
+                    :maxlength="40"
+                    @change="
+                      pageInfo.curr = 1;
+                      parmValue.page = 1;
+                      searchList();
+                    "
+                    placeholder="创建人部门"
+                  ></el-input>
+                </el-col>
+                <el-col :span="4" style="width: 175px; padding: 0 0 0 10px">
                   <el-input
                     :size="searchSize"
                     v-model="parmValue.allot_code"
@@ -89,20 +101,9 @@
                     重置
                   </el-button>
                 </el-col>
-                <el-col :span="4" style="width: 66px; float: right">
-                  <el-button
-                    type="success"
-                    class="fr"
-                    style="float: right"
-                    :size="searchSize"
-                    @click="openModal('add', false)"
-                  >
-                    新建
-                  </el-button>
-                </el-col>
               </el-col>
             </el-row>
-            <el-row style="padding: 10px 0 0 0">
+            <el-row style="padding: 10px 0 0 0px">
               <el-col :span="4" style="width: 125px">
                 <el-dropdown @command="handleClick($event)" :size="searchSize">
                   <el-button :size="searchSize">
@@ -122,7 +123,7 @@
                   </el-dropdown-menu>
                 </el-dropdown>
               </el-col>
-              <el-col :span="12" style="width: 280px; padding: 0 0 0 10px">
+              <el-col :span="12" style="width: 260px; padding: 0 0 0 10px">
                 <search-work-company
                   :value="parmValue.companyNo"
                   :names="''"
@@ -132,7 +133,7 @@
                   @searchChange="companyNoChange"
                 />
               </el-col>
-              <el-col :span="4" style="width: 300px; padding: 0 0 0 10px">
+              <el-col :span="4" style="width: 260px; padding: 0 0 0 10px">
                 <search-supplier
                   :size="searchSize"
                   :value="parmValue.supplierNo"
@@ -142,7 +143,7 @@
                   @searchChange="supplierChange"
                 />
               </el-col>
-              <el-col :span="4" style="width: 272px; padding: 0 0 0 10px">
+              <el-col :span="4" style="width: 262px; padding: 0 0 0 10px">
                 <search-stock
                   :size="searchSize"
                   :value="parmValue.stockNo"
@@ -154,6 +155,17 @@
                   @searchChange="stockChange"
                 />
               </el-col>
+              <el-col :span="4" style="width: 66px; float: right">
+                <el-button
+                  type="success"
+                  class="fr"
+                  style="float: right"
+                  :size="searchSize"
+                  @click="openModal('add', false)"
+                >
+                  新建
+                </el-button>
+              </el-col>
             </el-row>
           </div>
         </template>
@@ -182,7 +194,7 @@
           >
             <i
               class="el-icon-view tb-icon"
-              @click="getRouter('allotDetail', scope.row.id )"
+              @click="getRouter('allotDetail', scope.row.id)"
             ></i>
           </el-tooltip>
         </template>
@@ -254,6 +266,7 @@ export default {
         end: "", //结束日期
         allot_code: "", //调拨编号
         supplierNo: [], //供应商code
+        company_name: "", //创建人部门
         stockNo: [], //仓库code
         page: 1,
         size: 15,
@@ -279,38 +292,37 @@ export default {
     const { back } = this.$route.query;
     if (back) {
       this.parmValue = JSON.parse(back);
-      const {page,size}=this.parmValue
-       this.pageInfo= {
+      const { page, size } = this.parmValue;
+      this.pageInfo = {
         size: size,
         curr: page,
         total: 0,
-      }
+      };
       //多选条件
-    this.sselect = this.parmValue.sselect;
-    }else{
-       this.sselect = "按出库方筛选";
+      this.sselect = this.parmValue.sselect;
+    } else {
+      this.sselect = "按出库方筛选";
     }
 
-   
     this.searchList();
   },
 
   methods: {
-    getRouter(toRouter, queryId){
+    getRouter(toRouter, queryId) {
       if (toRouter && queryId) {
         let model = {
           id: queryId,
         };
 
         //有多选框的条件
-        this.parmValue.sselect = this.sselect ;
+        this.parmValue.sselect = this.sselect;
         //
-         let routerModel = {
+        let routerModel = {
           options: JSON.parse(JSON.stringify(this.parmValue)),
           router: this.$route.path,
         };
         model.preModel = JSON.stringify(routerModel);
-        
+
         this.routeGoto(toRouter, model);
       } else {
         this.$message.warning("暂未找到相关流程！");
@@ -339,6 +351,7 @@ export default {
       };
       this.parmValue = {
         companyNo: "",
+        company_name: "", //创建人部门
         start: "", //开始日期
         end: "", //结束日期
         allot_code: "", //调拨编号

src/views/stock/goodsRepertory/columns.js

@@ -141,6 +141,11 @@ const listCol = [
     label: "采购员",
     width: "70px",
   },
+  {
+    prop: "company_name",
+    label: "创建人部门",
+    minWidth: "150px",
+  },
   {
     prop: "creater",
     label: "创建人",

src/views/stock/goodsRepertory/index.vue

@@ -184,7 +184,8 @@
                   <!-- <el-option label="供应商编号" value="4" /> -->
                   <el-option label="业务企业编号" value="5" />
                   <el-option label="平台商品编号" value="6" />
-                  <el-option label="创建人" value="7" /> </el-select
+                  <el-option label="创建人" value="7" /> 
+                  <el-option label="创建人部门" value="8" /> </el-select
               ></el-input>
             </el-col>
             <el-col
@@ -327,6 +328,7 @@ export default {
         companyNo: "", //业务企业编号
         // exam_status: "6", //审核状态
         plat_code: "", //平台商品编号
+        company_name:"", //创建人部门
         creater: "", //
       },
 
@@ -397,6 +399,7 @@ export default {
         companyNo: "", //业务企业编号
         // exam_status: "6", //审核状态
         plat_code: "", //平台商品编号
+        company_name:"", //创建人部门
         creater: "", //
       };
       this.searchList();
@@ -593,6 +596,7 @@ export default {
       // model.exam_status = this.select === "1" ? this.sinput : ""; //审核状态
       model.plat_code = this.select === "6" ? this.sinput : ""; //平台商品编号
       model.creater = this.select === "7" ? this.sinput : ""; //
+      model.company_name = this.select === "8" ? this.sinput : ""; //
       const res = await asyncRequest.list(model);
       if (res && res.code === 0 && res.data) {
         this.tableData = res.data.list;

src/views/stock/stockWarning/colums.js

@@ -55,6 +55,11 @@ export default [{
   //   prop: "good_desc",
   //   label: "工艺说明",
   // },
+  {
+    prop: "company_name",
+    label: "采购人部门",
+    minWidth: "150px",
+  },
   {
     prop: "cgder",
     label: "采购人",

src/views/stock/stockWarning/index.vue

@@ -78,7 +78,7 @@
                   @searchChange="selectSupplier"
                 />
               </el-col>
-              <el-col :span="12" style="width: 380px; padding-left: 10px">
+              <el-col :span="12" style="width: 350px; padding-left: 10px">
                 <search-stock
                   :isDetail="true"
                   :size="searchSize"
@@ -91,6 +91,20 @@
                   @searchChange="selectStock"
                 />
               </el-col>
+              <el-col :span="6" style="width: 150px; padding: 0 0 0 10px">
+                <el-input
+                  placeholder="采购人部门"
+                  v-model="parmValue.company_name"
+                  :size="searchSize"
+                  @blur="
+                    pageInfo.curr = 1;
+                    parmValue.page = 1;
+                    searchList();
+                  "
+                  class="input"
+                >
+                </el-input>
+              </el-col>
 
               <el-col :span="4" style="width: 66px; float: right">
                 <el-button
@@ -180,7 +194,7 @@
    <script>
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
-import {statusList} from "@/assets/js/statusList";
+import { statusList } from "@/assets/js/statusList";
 import asyncRequest from "@/apis/service/stock/stockWarning";
 import colums from "./colums";
 import addEdit from "./addEdit";
@@ -224,6 +238,7 @@ export default {
         warn_up: "",
         stock_low: "",
         stock_up: "",
+        company_name:"", //部门
         page: 1,
         size: 15,
       },
@@ -252,7 +267,7 @@ export default {
   methods: {
     //业务公司选择
     async supplierChange(e) {
-      console.log(e)
+      console.log(e);
       const { code } = e;
       this.parmValue.companyNo = code || ""; //业务公司编码
       this.parmValue.supplier_code = [];
@@ -294,10 +309,7 @@ export default {
         this.parmValue.warn_low = "";
         this.parmValue.warn_up = "";
       }
-      if (
-        this.parmValue.warn_low != "" &&
-        this.parmValue.warn_up != ""
-      ) {
+      if (this.parmValue.warn_low != "" && this.parmValue.warn_up != "") {
         await this.searchList();
       }
     },
@@ -310,10 +322,7 @@ export default {
         this.parmValue.stock_low = "";
         this.parmValue.stock_up = "";
       }
-      if (
-        this.parmValue.stock_low != "" &&
-        this.parmValue.stock_up != ""
-      ) {
+      if (this.parmValue.stock_low != "" && this.parmValue.stock_up != "") {
         await this.searchList();
       }
     },
@@ -334,6 +343,7 @@ export default {
         warn_up: "",
         stock_low: "",
         stock_up: "",
+        company_name:"", //部门
         page: 1,
         size: 15,
       };