Merge branch 'feature/Feature-supply' into develop

src/components/Common/print-foshan.vue

@@ -52,7 +52,7 @@
               <el-col :span="3">{{ item.refundableQty || 0 }}</el-col>
             </el-row>
             <el-row :gutter="20">
-              <el-col :span="4">{{ item.invoiceId || '' }}</el-col>
+              <el-col :span="4">{{ item.mainOrderId || '' }}</el-col>
               <el-col :span="2">发货日期</el-col>
               <el-col :span="4">{{ item.theTime || '' }}</el-col>
               <el-col :span="2">工程编号</el-col>

src/views/basic_data/stock.vue

@@ -0,0 +1,5 @@
+<template>
+  <div>
+    <router-view />
+  </div>
+</template>

src/views/finance/cash.vue

@@ -0,0 +1,5 @@
+<template>
+  <div>
+    <router-view />
+  </div>
+</template>

src/views/finance/details.vue

@@ -0,0 +1,5 @@
+<template>
+  <div>
+    <router-view />
+  </div>
+</template>

src/views/finance/rebate.vue

@@ -0,0 +1,5 @@
+<template>
+  <div>
+    <router-view />
+  </div>
+</template>

src/views/sales/price.vue

@@ -0,0 +1,5 @@
+<template>
+  <div>
+    <router-view />
+  </div>
+</template>

src/views/sales/sales_policy.vue

@@ -0,0 +1,5 @@
+<template>
+  <div>
+    <router-view />
+  </div>
+</template>

src/views/sales/sales_rebate.vue

@@ -0,0 +1,5 @@
+<template>
+  <div>
+    <router-view />
+  </div>
+</template>

src/views/setting/menu.vue

@@ -49,6 +49,9 @@
         <el-form-item label="URL" prop="url">
           <el-input placeholder="请输入URL" v-model="addParentForm.url"></el-input>
         </el-form-item>
+        <el-form-item label="全URL" prop="fullUrl">
+          <el-input placeholder="请输入全URL" v-model="addParentForm.fullUrl" :disabled="!isAdmin"></el-input>
+        </el-form-item>
         <el-form-item label="图标" prop="icon">
           <div class="iconInput">
             <div class="icon" v-if="addParentForm.icon"><i :class="addParentForm.icon"></i></div>
@@ -147,6 +150,7 @@ export default {
         oneMenu: '',
         code: '',
         url: '',
+        fullUrl: '',
         icon: '',
         sort: 0,
       },
@@ -549,6 +553,7 @@ export default {
             oneMenu: res.data.moduleName,
             code: res.data.code,
             url: res.data.url,
+            fullUrl: res.data.fullUrl,
             icon: res.data.icon,
             sort: res.data.sortNum
           }
@@ -570,6 +575,7 @@ export default {
             moduleName: this.addParentForm.oneMenu,
             code: this.addParentForm.code,
             url: this.addParentForm.url,
+            fullUrl: this.addParentForm.fullUrl,
             icon: this.addParentForm.icon,
             sortNum: this.addParentForm.sort,
             parentId: 0,
@@ -582,7 +588,7 @@ export default {
               this.$successMsg('编辑成功');
             })
           }else {
-            params.type = 2;
+            // params.type = 2;
             addMenu(params).then(res => {
               this.cancelAddParentForm();
               this.getList();
@@ -660,7 +666,7 @@ export default {
               fullUrl: this.addChildForm.fullUrl,
               icon: this.addChildForm.icon,
               sortNum: this.addChildForm.sort,
-              type: 2
+              // type: 2
             }
             addMenu(params).then(res => {
               this.cancelAddChildForm();

src/views/supply/pickup/check.vue

@@ -276,6 +276,10 @@ export default {
 
     // 查询列表
     getList() {
+      if(!this.screenForm.manId) {
+        return this.$errorMsg('请先查询提货人信息');
+      }
+
       this.listLoading = true;
 
       let params = {