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

src/views/purchaseIn/purchaseOrder/index.vue

@@ -146,6 +146,19 @@
                 </el-select>
               </el-col>
 
+              <!-- <el-col :span="4">
+                  <el-select style="margin-right:10px" placeholder="供应商端" clearable size="mini"  v-model="parmValue.has_account"  
+                    @change="
+                        pageInfo.curr = 1;
+                        parmValue.page = 1;
+                        searchList();
+                      "
+                  >
+                    <el-option value="0" label="未开通" />
+                    <el-option value="1" label="已开通"/>
+                  </el-select>
+              </el-col> -->
+
               <el-col :span="4">
                 <search-supplier
                   :size="'mini'"
@@ -160,6 +173,7 @@
                 />
               </el-col>
 
+
               <el-col :span="4" style="width: 66px; float: right">
                 <el-button
                   type="warning"
@@ -200,7 +214,7 @@
             </el-row>
 
             <el-row>
-              <el-col :span="6" style="width: 500px; margin-top: 10px">
+              <el-col :span="4" style="width: 500px; margin-top: 10px">
                 <el-input
                   clearable
                   placeholder="关键字"
@@ -238,19 +252,6 @@
                     <el-option label="商品创建人部门" value="9"></el-option>
                   </el-select>
                 </el-input>
-              </el-col>
-
-              <el-col :span="4" >
-                  <el-select style="width:100%;margin-left:10px;margin-top:10px" placeholder="供应商端开启状态" clearable size="mini"  v-model="parmValue.has_account"  
-                    @change="
-                        pageInfo.curr = 1;
-                        parmValue.page = 1;
-                        searchList();
-                      "
-                  >
-                    <el-option value="0" label="未开通" />
-                    <el-option value="1" label="已开通"/>
-                  </el-select>
               </el-col> 
             </el-row>
           </div>
@@ -820,6 +821,8 @@ export default {
       // this.parmValue.supplier_name = this.select === "10" ? this.input : ""; // 采购供应商名称
       // this.wsm_supplierNo = [];
 
+      console.log(this.parmValue.has_account)
+
       const res = await asyncRequest.list({
         ...this.parmValue,
         supplierNo: Array.isArray(this.supplierNo) ? this.supplierNo[0] : this.supplierNo,

src/views/purchaseIn/purchaseReturn/columns.js

@@ -43,6 +43,12 @@ export default [
     label: '商品名称',
     width: '150'
   },
+  {
+    prop: 'has_account',
+    label: '供应商端',
+    _slot_: 'has_account',
+    width: '120px'
+  },
   {
     prop: 'order_type',
     _slot_: 'order_type',

src/views/purchaseIn/purchaseReturn/index.vue

@@ -165,10 +165,23 @@
 
 
             <el-row>
+              <!-- <el-col :span="4" style="margin-right:10px;">
+                  <el-select style="width:100%;margin-top:10px;" placeholder="供应商端" clearable size="mini"  v-model="parmValue.has_account"  
+                    @change="
+                        pageInfo.curr = 1;
+                        parmValue.page = 1;
+                        searchList();
+                      "
+                  >
+                    <el-option value="0" label="未开通" />
+                    <el-option value="1" label="已开通"/>
+                  </el-select>
+              </el-col>  -->
+
               <el-col :span="4">
                 <search-supplier
                   :size="'mini'"
-                  style="width: 220px;margin-top:10px"
+                  style="width: 100%;margin-top:10px"
                   :value="supplierNo"
                   :disabled="false"
                   :placeholder="'供应商名称'"
@@ -195,6 +208,13 @@
           ></el-tag>
         </template>
 
+        <template #has_account="{ scope }">
+          <el-tag
+            :size="tablebtnSize"
+            :type="has_account_list.find(({code}) => code === String(scope.row.has_account))?.type"
+          >{{ has_account_list.find(({code}) => code === String(scope.row.has_account))?.name }}</el-tag>
+        </template>
+
         <template #order_source="{ scope }">
           <el-tag
             size="mini"
@@ -272,7 +292,7 @@ import resToken from "@/mixins/resToken";
 import columns from "./columns";
 import asyncRequest from "@/apis/service/purchaseIn/purchaseReturn";
 import { mapGetters } from "vuex";
-import { cg_order_type_options , cg_order_source_options} from "@/assets/js/statusList";
+import { cg_order_type_options , cg_order_source_options, has_account_list} from "@/assets/js/statusList";
 import companyHelper from "@/mixins/companyHelper";
 export default {
   name: "purchaseReturn",
@@ -308,11 +328,13 @@ export default {
       ],
       cg_order_type_options,
       cg_order_source_options,
+      has_account_list,
       loading: true,
       showModel: false,
       isDetail: false,
       modelId: 0,
       parmValue: {
+        has_account: "",
         order_source: "",
         order_type: "",
         cgdNo: "", //采购单编号
@@ -458,11 +480,14 @@ export default {
     async searchList() {
       this.loading = true;
       let model = JSON.parse(JSON.stringify(this.parmValue));
+      console.log(model);
+      
       const res = await asyncRequest.list({
         ...model,
         supplierNo:Array.isArray(this.supplierNo) ? this.supplierNo[0] : this.supplierNo,
         needRela: true
       });
+
       if (res && res.code === 0 && res.data) {
         this.tableData = res.data.list;
         this.pageInfo.total = Number(res.data.count);

src/views/purchaseIn/wsmInOrder/columns.js

@@ -10,10 +10,10 @@ const columns = [
     width: "155px",
   },
   {
-    prop: "has_account",
-    label: "供应商端开启状态",
-    _slot_: "has_account",
-    width: "120px",
+    prop: 'has_account',
+    label: '供应商端',
+    _slot_: 'has_account',
+    width: '120px'
   },
   {
     prop: "status",

src/views/purchaseIn/wsmInOrder/index.vue

@@ -104,38 +104,40 @@
                       searchList();
                     "
                   >
-                    <el-select
-                      v-model="select"
-                      style="width: 145px"
-                      slot="prepend"
-                      placeholder="关键字类型"
-                      @change="
-                        pageInfo.curr = 1;
-                        parmValue.page = 1;
-                        searchList();
-                      "
-                    >
-                      <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-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"
-                      @click="
+                    <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-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"
+                    @click="
+                      pageInfo.curr = 1;
+                      parmValue.page = 1;
+                      searchList();
+                    "
+                    icon="el-icon-search"
+                  ></el-button>
+                </el-input>
+              </el-col>
+<!-- 
+              <el-col :span="4" >
+                  <el-select style="width:100%;margin-left:10px" placeholder="供应商端" clearable size="mini"  v-model="parmValue.has_account"  
+                    @change="
                         pageInfo.curr = 1;
                         parmValue.page = 1;
                         searchList();
                       "
-                      icon="el-icon-search"
-                    ></el-button>
-                  </el-input>
-                </el-col>
-              </el-row>
+                  >
+                    <el-option value="0" label="未开通" />
+                    <el-option value="1" label="已开通"/>
+                  </el-select>
+              </el-col>  -->
+            </el-row>
 
               <el-col :span="4" style="width: 66px; float: right">
                 <el-button
@@ -186,25 +188,7 @@
                   :noDisabled="true"
                   @searchChange="supplierChange"
                 />
-              </el-col>
-
-              <el-col :span="4">
-                <el-select
-                  style="width: 100%; margin-left: 10px; margin-top: 10px"
-                  placeholder="供应商端开启状态"
-                  clearable
-                  size="mini"
-                  v-model="parmValue.c"
-                  @change="
-                    pageInfo.curr = 1;
-                    parmValue.page = 1;
-                    searchList();
-                  "
-                >
-                  <el-option value="0" label="未开通" />
-                  <el-option value="1" label="已开通" />
-                </el-select>
-              </el-col>
+             </el-col>
             </el-row>
 
             <!-- <el-col :span="4" style="width: 120px">
@@ -249,9 +233,8 @@
         <template #has_account="{ scope }">
           <el-tag
             :size="tablebtnSize"
-            :type="scope.row.has_account == '0' ? 'warning' : ''"
-            >{{ String(scope.row.has_account) === "1" ? "已开通" : "未开通" }}</el-tag
-          >
+            :type="has_account_list.find(({code}) => code === String(scope.row.has_account))?.type"
+          >{{ has_account_list.find(({code}) => code === String(scope.row.has_account))?.name }}</el-tag>
         </template>
 
         <template #order_source="{ scope }">
@@ -313,10 +296,11 @@ import resToken from "@/mixins/resToken";
 import companyHelper from "@/mixins/companyHelper";
 
 import asyncRequest from "@/apis/service/purchaseIn/wsmInOrder";
-import { cg_order_type_options, cg_order_source_options } from "@/assets/js/statusList";
-import { columns } from "./columns"; //表格列参数
+import { cg_order_type_options, cg_order_source_options, has_account_list } from "@/assets/js/statusList";
+import columns from "./columns"; //表格列参数
 import { mapGetters } from "vuex";
 
+
 export default {
   name: "purchaseOrder",
   mixins: [mixinPage, resToken, companyHelper],
@@ -345,6 +329,7 @@ export default {
       sselect: "创建时间",
       cg_order_type_options,
       cg_order_source_options,
+      has_account_list,
 
       // 状态
       statusOptions: [
@@ -474,6 +459,7 @@ export default {
         end: "", // 结束时间
       };
       this.parmValue = {
+        has_account: "",
         order_type: "",
         // bk_code: "", // 备库编码
         wsm_in_code: "", // 入库单号
@@ -582,6 +568,7 @@ export default {
         size: model.size,
         company_name: model.company_name,
         order_source: model.order_source,
+        has_account: model.has_account,
         needRela: true,
       };
       const res = await asyncRequest.list(_model);

src/views/sellOut/deliveryWorkOrder/index.vue

@@ -212,8 +212,8 @@
                   </el-input>
                 </el-col>
 
-                <el-col :span="4" style="margin-left: 10px;margin-top:10px">
-                  <el-select placeholder="供应商端开启状态" clearable size="mini"  v-model="parmValue.has_account"  
+                <!-- <el-col :span="4" style="margin-left: 10px;margin-top:10px">
+                  <el-select placeholder="供应商端" clearable size="mini"  v-model="parmValue.has_account"  
                     @change="
                         pageInfo.curr = 1;
                         parmValue.page = 1;
@@ -223,7 +223,7 @@
                     <el-option value="0" label="未开通" />
                     <el-option value="1" label="已开通"/>
                   </el-select>
-                </el-col>
+                </el-col> -->
             </el-row>
           </div>
 
@@ -242,8 +242,8 @@
         <template #has_account="{ scope }">
           <el-tag
             :size="tablebtnSize"
-            :type="scope.row.has_account == '0' ? 'warning' : ''"
-          >{{ String(scope.row.has_account) === '1' ? '已开通' : '未开通' }}</el-tag>
+            :type="has_account_list.find(({code}) => code === String(scope.row.has_account))?.type"
+          >{{ has_account_list.find(({code}) => code === String(scope.row.has_account))?.name }}</el-tag>
         </template>
 
         <template #order_type="{ scope }">
@@ -299,7 +299,7 @@ import columns from "./columns";
 import asyncRequest from "@/apis/service/sellOut/deliveryWorkOrder";
 import { mapGetters } from "vuex";
 import urlConfig from "@/apis/url-config";
-import { xs_order_type_options ,xs_order_source_options} from "@/assets/js/statusList";
+import { xs_order_type_options ,xs_order_source_options,has_account_list} from "@/assets/js/statusList";
 import companyHelper from "@/mixins/companyHelper"
 
 export default {
@@ -320,6 +320,7 @@ export default {
     return {
       xs_order_type_options,
       xs_order_source_options,
+      has_account_list,
       fileUrl: urlConfig.baseURL,
       select: "outChildCode", //默认选择下拉框
       s_input: "", //搜索框内容

src/views/sellOut/sellAfterApply/columns.js

@@ -90,7 +90,7 @@ const columns = [
   // },
   {
     prop: 'has_account',
-    label: '供应商端开启状态',
+    label: '供应商端',
     _slot_: 'has_account',
     width: '120px'
   },

src/views/sellOut/sellAfterApply/index.vue

@@ -127,8 +127,8 @@
                   ></el-button>
                 </el-input>
               </el-col>
-              <el-col :span="4" >
-                  <el-select style="width:100%;margin-left:10px" placeholder="供应商端开启状态" clearable size="mini"  v-model="parmValue.has_account"  
+              <!-- <el-col :span="4" >
+                  <el-select style="width:100%;margin-left:10px" placeholder="供应商端" clearable size="mini"  v-model="parmValue.has_account"  
                     @change="
                         pageInfo.curr = 1;
                         parmValue.page = 1;
@@ -138,7 +138,7 @@
                     <el-option value="0" label="未开通" />
                     <el-option value="1" label="已开通"/>
                   </el-select>
-              </el-col>
+              </el-col> -->
 
               <el-col :span="2" style="width: 65px;float: right">
                 <el-button
@@ -228,11 +228,12 @@
           ></el-tag>
         </template>
 
+
         <template #has_account="{ scope }">
           <el-tag
             :size="tablebtnSize"
-            :type="scope.row.has_account == '0' ? 'warning' : ''"
-          >{{ String(scope.row.has_account) === '1' ? '已开通' : '未开通' }}</el-tag>
+            :type="has_account_list.find(({code}) => code === String(scope.row.has_account))?.type"
+          >{{ has_account_list.find(({code}) => code === String(scope.row.has_account))?.name }}</el-tag>
         </template>
 
 
@@ -315,7 +316,7 @@ import asyncRequest from "@/apis/service/sellOut/sellAfterApply";
 import { columns } from "./columns";
 import { mapGetters } from "vuex";
 import urlConfig from "@/apis/url-config";
-import { xs_order_source_options, xs_order_type_options } from "@/assets/js/statusList";
+import { xs_order_source_options, xs_order_type_options,has_account_list } from "@/assets/js/statusList";
 import companyHelper from "@/mixins/companyHelper";
 
 export default {
@@ -337,6 +338,7 @@ export default {
       supplierNo: "",
       xs_order_source_options, 
       xs_order_type_options,
+      has_account_list,
       fileUrl: urlConfig.baseURL,
       select: "serviceNum",
       select_list:[],

src/views/sellOut/sellReturn/columns.js

@@ -12,7 +12,7 @@ export default [
   },
   {
     prop: 'has_account',
-    label: '供应商端开启状态',
+    label: '供应商端',
     _slot_: 'has_account',
     width: '120px'
   },

src/views/sellOut/sellReturn/index.vue

@@ -202,8 +202,8 @@
                   </el-input>
                 </el-col>
 
-                <el-col :span="4" >
-                  <el-select style="width:100%;margin-left:10px;margin-top:10px" placeholder="供应商端开启状态" clearable size="mini"  v-model="parmValue.has_account"  
+                <!-- <el-col :span="4" >
+                  <el-select style="width:100%;margin-left:10px;margin-top:10px" placeholder="供应商端" clearable size="mini"  v-model="parmValue.has_account"  
                     @change="
                         pageInfo.curr = 1;
                         parmValue.page = 1;
@@ -213,7 +213,7 @@
                     <el-option value="0" label="未开通" />
                     <el-option value="1" label="已开通"/>
                   </el-select>
-              </el-col>
+              </el-col> -->
             </el-row>
           </div>
         </template>
@@ -257,8 +257,8 @@
         <template #has_account="{ scope }">
           <el-tag
             :size="tablebtnSize"
-            :type="scope.row.has_account == '0' ? 'warning' : ''"
-          >{{ String(scope.row.has_account) === '1' ? '已开通' : '未开通' }}</el-tag>
+            :type="has_account_list.find(({code}) => code === String(scope.row.has_account))?.type"
+          >{{ has_account_list.find(({code}) => code === String(scope.row.has_account))?.name }}</el-tag>
         </template>
 
         <template #operation="{ scope }">
@@ -289,7 +289,7 @@ import columns from "./columns";
 import asyncRequest from "@/apis/service/sellOut/sellReturn";
 import { mapGetters } from "vuex";
 import urlConfig from "@/apis/url-config";
-import { xs_order_type_options ,xs_order_source_options} from "@/assets/js/statusList";
+import { xs_order_type_options ,xs_order_source_options,has_account_list} from "@/assets/js/statusList";
 import companyHelper from "@/mixins/companyHelper"
 
 export default {
@@ -309,6 +309,7 @@ export default {
       xs_order_type_options,
       xs_order_source_options,
       fileUrl: urlConfig.baseURL,
+      has_account_list,
       select: "returnCode", //默认选择下拉框
       s_input: "", //搜索框内容
       select_list:[],