Merge remote-tracking branch 'origin/master'

src/views/inout/DialogInvoice.vue

@@ -96,7 +96,7 @@
                 <el-button slot="trigger" size="small" type="primary" :disabled="formData.auditStatus == 1">
                   {{ choiceFile }}
                 </el-button>
-                <div>只能上传 jpg,png,pdf,doc 文件，且不超过 10 MB</div>
+                <div>只能上传 jpg,png 文件，且不超过 10 MB</div>
               </el-upload>
             </el-form-item>
           </el-col>

src/views/inventory/InvSupProuducts.vue

@@ -231,6 +231,7 @@ export default {
       list: [],
       total: 0,
       invList: [],
+      invLists: [],
       loading: false,
       deleteData: {
         id: "",
@@ -322,7 +323,8 @@ export default {
     getInvList() {
       getInvListByUser()
         .then((response) => {
-          this.invList = response.data || [];
+          this.invLists = response.data || [];
+          this.invList = this.invLists.filter(  item => item.code != 1000001 && item.code != 1000002)
           this.getList();
         })
         .catch(() => {