修改bug

src/views/inout/DialogCheck.vue

@@ -117,7 +117,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item prop="code">
-              <el-input v-model="inputQuery.reCount" auto-complete="off" :disabled="true"></el-input>
+              <el-input v-model="inputQuery.scanCount" auto-complete="off" :disabled="true"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -299,6 +299,8 @@ export default {
     //
     // },
     uploadHandleRemove(file, fileList) {
+      this.inputQuery.filePath=null;
+      this.inputQuery.checkFileName=null;
       console.log(file, fileList);
     },
     uploadHandlePreview(file) {

src/views/inout/InvoiceRegistration.vue

@@ -273,6 +273,7 @@
     </el-tabs>
 
 
+
     <el-tabs type="border-card" style="margin: 15px">
       <!--单据业务详情-->
       <el-tab-pane>
@@ -439,6 +440,8 @@ import {previewImage} from '@/api/purchase/supCompany'
 import ElImageViewer from "element-ui/packages/image/src/image-viewer";
 
 
+
+
 const formJson = {
   site_id: "",
   site_name: "",
@@ -926,9 +929,13 @@ export default {
         this.bizTotal = 0;
       })
     },
-    BizDetail(row) {
+
+    BizDetail(val){
+      debugger
       this.bizQuery.page=1;
-      this.getBizDetailList(row);
+      this.bizQuery.productName=val.coName;
+      this.bizQuery.batchNo=val.batchNo;
+      this.getBizDetailList();
     },
 
 

src/views/inout/IoDeliveryAuditOrder.vue

@@ -142,16 +142,16 @@
         <el-table-column label="送货单位" prop="fromName" width="220">
         </el-table-column>
         <el-table-column label="创建时间" prop="createTime" show-overflow-tooltip width="150">
-          <template slot-scope="scope">
-            <i class="el-icon-time"></i>
-            <span>{{ scope.row.createTime }}</span>
-          </template>
+          <!--<template slot-scope="scope">-->
+          <!--  <i class="el-icon-time"></i>-->
+          <!--  <span>{{ scope.row.createTime }}</span>-->
+          <!--</template>-->
         </el-table-column>
         <el-table-column label="审核时间" prop="auditTime" show-overflow-tooltip width="150">
-          <template slot-scope="scope">
-            <i class="el-icon-time"></i>
-            <span>{{ scope.row.createTime }}</span>
-          </template>
+          <!--<template slot-scope="scope">-->
+          <!--  <i class="el-icon-time"></i>-->
+          <!--  <span>{{ scope.row.createTime }}</span>-->
+          <!--</template>-->
         </el-table-column>
 
         <el-table-column label="采购部门" prop="deptName" width="120">

src/views/inout/IoSupSearchOrder.vue

@@ -96,12 +96,6 @@
       <div class="top-right-btn">
         <el-button-group>
           <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
-          <el-button
-            type="primary"
-            icon="el-icon-refresh"
-            @click="onReset"
-          >发票登记
-          </el-button>
           <el-button
             type="primary"
             icon="el-icon-refresh"
@@ -568,6 +562,8 @@ export default {
         endTime: null,
         invCode: this.$store.getters.locInvCode,
       };
+      this.actDateRange=[];
+      this.auditDateRange=[];
       this.getList();
     },
     onSubmit() {

src/views/system/role/index.vue

@@ -28,7 +28,7 @@
               <el-button-group>
                 <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
                 <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-                <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
+                <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd(0)">新增</el-button>
               </el-button-group>
 
             </el-form-item>
@@ -133,7 +133,7 @@
               <el-button-group>
                 <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
                 <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-                <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
+                <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd(1)">新增</el-button>
               </el-button-group>
 
             </el-form-item>
@@ -236,20 +236,16 @@
           </el-form-item>
           <el-form-item label="状态" prop="status">
             <el-radio-group v-model="form.status" >
-              <el-radio
-                v-for="dict in dict.type.sys_normal_disable"
-                :key="dict.value"
-                :label="dict.value"
-              >{{ dict.label }}
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item label="供应商角色" prop="isCustomer">
-            <el-radio-group v-model="form.isCustomer">
-              <el-radio :label="0">否</el-radio>
-              <el-radio :label="1">是</el-radio>
+              <el-radio label="0" >正常</el-radio>
+              <el-radio label="1" >禁用</el-radio>
             </el-radio-group>
           </el-form-item>
+          <!--<el-form-item label="供应商角色" prop="isCustomer">-->
+          <!--  <el-radio-group v-model="form.isCustomer">-->
+          <!--    <el-radio :label="0">否</el-radio>-->
+          <!--    <el-radio :label="1">是</el-radio>-->
+          <!--  </el-radio-group>-->
+          <!--</el-form-item>-->
           <el-form-item label="菜单权限">
             <el-checkbox v-model="menuExpand" @change="handleCheckedTreeExpand($event, 'menu')">展开/折叠</el-checkbox>
             <el-checkbox v-model="menuNodeAll" @change="handleCheckedTreeNodeAll($event, 'menu')">全选/全不选
@@ -341,6 +337,7 @@ export default {
   dicts: ['sys_normal_disable'],
   data() {
     return {
+      userStatus:null,
       // 遮罩层
       loading: true,
       Adminloading:true,
@@ -621,7 +618,8 @@ export default {
       }
     },
     /** 新增按钮操作 */
-    handleAdd() {
+    handleAdd(val) {
+      this.userStatus=val;
       this.reset();
       this.getMenuTreeselect();
       this.open = true;
@@ -676,12 +674,17 @@ export default {
       this.$router.push("/system/role-auth/user/" + roleId);
     },
     /** 提交按钮 */
-    submitForm: function () {
-      if(this.form.isCustomer == null){
-        this.$message("请选择供应商角色")
-        return
+    submitForm: function (val) {
+      // if(this.form.isCustomer == null){
+      //   this.$message("请选择供应商角色")
+      //   return
+      // }
+      debugger
+      if(this.userStatus == 0){
+        this.form.isCustomer=0;
+      }else{
+        this.form.isCustomer=1;
       }
-
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.roleId != undefined) {
@@ -690,6 +693,7 @@ export default {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
+              this.getCustomerList();
             });
           } else {
             this.form.menuIds = this.getMenuAllCheckedKeys();
@@ -697,6 +701,7 @@ export default {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
+              this.getCustomerList();
             });
           }
         }
@@ -720,6 +725,7 @@ export default {
         return delRole(roleIds);
       }).then(() => {
         this.getList();
+        this.getCustomerList();
         this.$modal.msgSuccess("删除成功");
       }).catch(() => {
       });

src/views/system/user/authUser.vue

@@ -167,7 +167,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="11" type="flex">
-              <el-form-item label="所属仓库" prop="depts">
+              <el-form-item label="所属仓库" prop="warehouse">
                 <el-select
                   v-model="formData.warehouseName"
                   filterable
@@ -190,7 +190,6 @@
                       }}</span>
                   </el-option>
                 </el-select>
-
               </el-form-item>
             </el-col>