【修改】调整

src/views/deposit_commerce/deposit_list.vue

@@ -242,6 +242,7 @@
       <div class="btn-group clearfix" style="display: flex">
         <el-button type="primary" size="mini" @click="hanleDownloadFiles">导出</el-button>
         <el-upload
+          v-if="!isCustomer"
           class="import-btn"
           :action="baseURL + 'student/import'"
           :http-request="handleImport"

src/views/deposit_home/deposit_list.vue

@@ -241,7 +241,13 @@
         <el-button type="primary" size="mini" @click="hanleDownloadFiles">导出 </el-button>
         <!--       -->
 
-        <el-upload class="import-btn" :http-request="handleImport" :file-list="importFileList" :show-file-list="false">
+        <el-upload
+          class="import-btn"
+          v-if="!isCustomer"
+          :http-request="handleImport"
+          :file-list="importFileList"
+          :show-file-list="false"
+        >
           <el-button size="mini" type="primary">导入</el-button>
         </el-upload>
       </div>

src/views/supply/sales/sales_list.vue

@@ -135,6 +135,14 @@
                     </el-select>
                   </el-form-item>
                 </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="存货类别" prop="categoryId">
+                    <el-select v-model="screenForm.categoryId" filterable clearable placeholder="请选择">
+                      <el-option v-for="item in categoryList" :key="item.id" :label="item.name" :value="item.id">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
               </el-row>
             </el-form>
           </template>
@@ -469,6 +477,8 @@ import SalesDetail from '@/views/supply/sales/components/sales_detail'
 import SalesExamine from '@/views/supply/sales/components/sales_examine'
 import SalesReturnForm from '@/views/supply/sales/components/sales_return_form'
 import ExamineDialog from '@/components/Common/examine-dialog'
+import { getCategoryList } from '@/api/common'
+import { getNoRebateWalletList } from '@/api/policy_list'
 
 let that
 export default {
@@ -524,7 +534,8 @@ export default {
         printTime: '',
         printDesc: null,
         syncStatus: '',
-        id: ''
+        id: '',
+        categoryId: ''
       },
       statusList: [
         { label: '已保存', value: 'SAVE' },
@@ -559,6 +570,7 @@ export default {
       edit: false,
       choiceDate: '',
       selectRow: [],
+      categoryList: [],
       multipleSelection: [],
       isShowExamineDialog: false,
       examineForm: {
@@ -596,7 +608,7 @@ export default {
         startTime: this.screenForm.date ? this.screenForm.date[0] : '',
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
         syncStatus: this.screenForm.syncStatus,
-
+        categoryId: this.screenForm.categoryId,
         approvalStartTime: this.screenForm.approval ? this.screenForm.approval[0] : '',
         approvalEndTime: this.screenForm.approval ? this.screenForm.approval[1] : '',
         printStartTime: this.screenForm.printTime ? this.screenForm.printTime[0] : '',
@@ -627,6 +639,7 @@ export default {
   created() {
     this.getWarehouseList()
     this.getList()
+    this.getCategoryList()
   },
 
   methods: {
@@ -645,6 +658,7 @@ export default {
         specification: this.screenForm.model,
         correspondId: this.screenForm.warehouse.join(','),
         syncStatus: this.screenForm.syncStatus,
+        categoryId: this.screenForm.categoryId,
 
         startTime: this.screenForm.date ? this.screenForm.date[0] : '',
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
@@ -676,7 +690,23 @@ export default {
         this.warehouseList = res.data.records
       })
     },
-
+    // 获取存货类别列表
+    getCategoryList() {
+      getCategoryList({
+        pageNum: 1,
+        pageSize: -1,
+        keyword: ''
+      }).then(res => {
+        this.categoryList = res.data.records
+        console.log(this.categoryList)
+      })
+      // getNoRebateWalletList({
+      //   walletName: ''
+      // }).then(res => {
+      //   console.log(res)
+      //   this.NoRebateWalletList = res.data
+      // })
+    },
     updateReceipt() {
       if (!this.value1) {
         this.$errorMsg('请选择时间')