build

src/App.vue

@@ -30,6 +30,7 @@ export default {
       if (!this.isDetailPage() || this.isSupertube) return
       const listPageUrl = this.getListPageUrl()
       this.$router.push(listPageUrl)
+      // console.log(listPageUrl)
     },
     isDetailPage() {
       const { path } = this.$route

src/views/goodStore/goodsCost/index.vue

@@ -126,36 +126,6 @@
                   @searchChange="supplierChange"
                 />
             </el-col>
-            <el-col :span="4" style="width: 420px; padding: 0 0 0 10px">
-              <el-input
-                :size="searchSize"
-                v-model="sinput"
-                :maxlength="40"
-                @blur="
-                  pageInfo.curr = 1;
-                  parmValue.page = 1;
-                  searchList();
-                "
-                placeholder="关键字"
-                ><el-select
-                  v-model="select"
-                  slot="prepend"
-                  style="width: 135px"
-                  @change="
-                    pageInfo.curr = 1;
-                    parmValue.page = 1;
-                    searchList();
-                  "
-                  placeholder="关键字类型"
-                >
-                  <el-option label="商品编号" value="1" />
-                  <el-option label="商品名称" value="2" />
-                  <!-- <el-option label="业务企业编号" value="3" /> -->
-                  <!-- <el-option label="供应商编号" value="4" /> -->
-                  <!-- <el-option label="创建人部门" value="5" /> -->
-                </el-select></el-input
-              >
-            </el-col>
 
             <el-col
               :span="3"
@@ -189,6 +159,39 @@
               </el-button>
             </el-col>
           </el-row>
+
+          <el-row>
+            <el-col :span="4" style="width: 420px;margin-top: 10px;">
+              <el-input
+                :size="searchSize"
+                v-model="sinput"
+                :maxlength="40"
+                @blur="
+                  pageInfo.curr = 1;
+                  parmValue.page = 1;
+                  searchList();
+                "
+                placeholder="关键字"
+                ><el-select
+                  v-model="select"
+                  slot="prepend"
+                  style="width: 135px"
+                  @change="
+                    pageInfo.curr = 1;
+                    parmValue.page = 1;
+                    searchList();
+                  "
+                  placeholder="关键字类型"
+                >
+                  <el-option label="商品编号" value="1" />
+                  <el-option label="商品名称" value="2" />
+                  <!-- <el-option label="业务企业编号" value="3" /> -->
+                  <!-- <el-option label="供应商编号" value="4" /> -->
+                  <!-- <el-option label="创建人部门" value="5" /> -->
+                </el-select></el-input
+              >
+            </el-col>
+          </el-row>
         </div></template
       >
 

src/views/interest/handover/components/addEditForm.vue

@@ -88,7 +88,6 @@
         <el-form-item label="审核备注" prop="remark">
           <el-input
             type="textarea"
-            disabled
             :autosize="{ minRows: 4, maxRows: 4 }"
             placeholder="审核备注"
             maxlength="250"

src/views/serviceParam/storeSet/addEdit.vue

@@ -40,7 +40,7 @@
                 <search-work-company
                   :value="ruleForm.companyNo"
                   :placeholder="'业务公司'"
-                  :disabled="isDetail || isUpdate"
+                  disabled
                   :size="'mini'"
                   :is-detail="false"
                   @searchChange="companyNosearchChange"
@@ -221,11 +221,12 @@
 <script>
 import asyncRequest from '@/apis/service/serviceParam/storeSet'
 import resToken from '@/mixins/resToken'
+import companyHelper from '@/mixins/companyHelper'
 import { isMobile, isSpecialSymbol, hasSpace, isAddr } from '@/utils/validate'
 import { mapGetters } from 'vuex'
 export default {
   name: 'StoreSet',
-  mixins: [resToken],
+  mixins: [resToken, companyHelper],
   props: ['showModel', 'id', 'isDetail'],
   computed: {
     isUpdate() {
@@ -540,6 +541,10 @@ export default {
             wsm_addr: '', // 收发货地址详细
             addrs_code: [] // 收发货省市区
           }
+
+          if (this.id === 'add') {
+            this.ruleForm.companyNo = this.currentCompany
+          }
         }
       })
     },

src/views/serviceParam/storeSet/index.vue

@@ -451,6 +451,12 @@ export default {
     },
 
     openModal(id, isDetail) {
+
+      if(id === 'add' && !this.currentCompany){
+        this.$message.warning("请选择业务公司")
+        return
+      }
+
       this.showModel = true;
       this.modelId = id;
       this.isDetail = isDetail;

src/views/stock/stockCount/components/spaceCount/columns.js

@@ -1,38 +1,38 @@
 export default [
   {
-    prop: "company_no",
-    label: "仓库业务公司编码",
-    width: "150",
+    prop: 'company_no',
+    label: '仓库业务公司编码',
+    width: '150'
   },
   {
-    prop: "company_name",
-    label: "仓库业务公司名称",
-    'min-width': "180"
+    prop: 'company_name',
+    label: '仓库业务公司名称',
+    'min-width': '180'
   },
   {
-    prop: "supplier_code",
-    label: "仓库所在公司编码",
-    width: "150",
+    prop: 'supplier_code',
+    label: '仓库所在公司编码',
+    width: '150'
   },
   {
-    prop: "supplier_name",
-    label: "仓库所在公司名称",
-    'min-width': "180"
+    prop: 'supplier_name',
+    label: '仓库所在公司名称',
+    'min-width': '180'
   },
   {
-    prop: "wsm_code",
-    label: "仓库编码",
+    prop: 'wsm_code',
+    label: '仓库编码',
     width: '180'
   },
   {
-    prop: "wsm_name",
-    label: "仓库名称",
-    'min-width': "100"
+    prop: 'wsm_name',
+    label: '仓库名称',
+    'min-width': '100'
   },
   {
-    prop: "good_code",
-    label: "商品编码",
-    width: "160",
+    prop: 'good_code',
+    label: '商品编码',
+    width: '160'
   },
   // {
   //   prop: "type_code",
@@ -40,51 +40,51 @@ export default [
   //   width: "150",
   // },
   {
-    prop: "good_name",
-    label: "商品名称",
-    "min-width": "150",
+    prop: 'good_name',
+    label: '商品名称',
+    'min-width': '150'
   },
   {
-    prop: "specinfo",
-    label: "规格",
-    "min-width": "150",
+    prop: 'specinfo',
+    label: '规格',
+    'min-width': '150',
     _slot_: 'specinfo'
   },
   {
-    prop: "can",
-    label: "分类",
+    prop: 'can',
+    label: '分类',
     _slot_: 'can',
-    width: "155",
+    width: '155'
   },
   {
-    prop: "brand_name",
-    label: "品牌",
-    width: "85",
+    prop: 'brand_name',
+    label: '品牌',
+    width: '85'
   },
 
   {
-    prop: "unit",
-    label: "单位",
-    width: "50",
+    prop: 'unit',
+    label: '单位',
+    width: '50'
   },
   {
-    prop: "usable_stock",
-    label: "当前库存",
-    width: "80",
+    prop: 'usable_stock',
+    label: '当前库存',
+    width: '80'
   },
   {
-    prop: "wait_in_stock",
-    label: "待入库",
-    width: "80",
+    prop: 'wait_in_stock',
+    label: '待入库',
+    width: '80'
   },
   {
-    prop: "wait_out_stock",
-    label: "待出库",
-    width: "80",
+    prop: 'wait_out_stock',
+    label: '待出库',
+    width: '80'
   },
   {
-    prop: "intra_stock",
-    label: "在途库存",
-    width: "80",
-  },
-]
+    prop: 'intra_stock',
+    label: '在途库存',
+    width: '80'
+  }
+]