Merge branch 'master' of http://116.204.71.86:3000/UDI/udiwms-vue-frame

2 years ago · 35d7002376
parent a7b4194dd1 45fcae8314
commit 35d7002376
23 changed files with 98 additions and 46 deletions
--- a/.env.test
+++ b/.env.test
@ -15,8 +15,8 @@ ENV = 'test'
 # 测试服务器
 # VUE_APP_BASE_API = 'http://192.168.0.66:9150/UDI_WMS_MC/'

-# 文明东
-VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_WMS_MC/'
+# 192.168.0.66测试服务器
+VUE_APP_BASE_API = 'http://192.168.0.66:8883/UDI_WMS_MC/'

 # 吴总测试服务器
 # VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_WMS_MC/'
--- a/src/views/basic/busType/bussinessType.vue
+++ b/src/views/basic/busType/bussinessType.vue
@ -422,6 +422,10 @@ export default {
        this.$message.error('请选择是否更改库存！')
        return
      }
+      if (this.inputQuery.sortNum > 999) {
+        this.$message.error('排序不能超过999！')
+        return
+      }
      // if (isBlank(this.inputQuery.busType)) {
      //   this.$message.error("请选择特定页面！");
      //   return;
--- a/src/views/basic/busType/bussinessTypeModify.vue
+++ b/src/views/basic/busType/bussinessTypeModify.vue
@ -188,7 +188,7 @@
          </el-form-item>
        </el-col>
      </el-row>
-
+      
      <el-row type="flex">
        <el-col :span="11">
          <el-form-item label="禁用单据类型" prop="prefix">
--- a/src/views/basic/corpMaintain/corpMaintain.vue
+++ b/src/views/basic/corpMaintain/corpMaintain.vue
@ -275,6 +275,9 @@ export default {
        // ],
        creditNo: [
          {required: true, message: "请输入社会信用号", trigger: "blur"}
+        ],
+        corpType: [
+          {required: true, message: "请选择往来单位类型", trigger: "blur"}
        ]
      },
      spellUpdate: false,
--- a/src/views/basic/corpMaintain/corpSelect.vue
+++ b/src/views/basic/corpMaintain/corpSelect.vue
@ -353,13 +353,17 @@ import {
            },

            selectExport() {
-                var selectData = this.multipleSelection;
+               /* var selectData = this.multipleSelection;
                selectData.forEach((obj) => {
                    this.query.ids.push(obj.id);
-                });
+                });*/
                this.allExport();
            },
            allExport() {
+              var selectData = this.multipleSelection;
+              selectData.forEach((obj) => {
+                this.query.ids.push(obj.id);
+              });
                exportExcel(this.query)
                    .then((response) => {
                        if (response.code == 20000) {
--- a/src/views/basic/product/udiInfoManageSp.vue
+++ b/src/views/basic/product/udiInfoManageSp.vue
@ -281,6 +281,7 @@ export default {
      };
      this.total = 0;
      this.list = [];
+      this.getList();
    },
    search() {
      this.filterQuery.page = 1;
@ -671,7 +672,7 @@ export default {
  }
  ,
  created() {
-    // this.getList();
+    this.getList();
    this.selectSysParam();
    this.getSysFilter();
    this.findMethod();
--- a/src/views/inout/DialogSelectReceiveOrder.vue
+++ b/src/views/inout/DialogSelectReceiveOrder.vue
@ -90,7 +90,7 @@
          <el-table-column label="单据号" prop="billNo"></el-table-column>
          <el-table-column label="领用仓库" prop="invName"></el-table-column>
          <el-table-column label="往来信息" prop="targetInvName" show-overflow-tooltip="true"></el-table-column>
-          <el-table-column label="单据日期" prop="billDate"></el-table-column>
+          <el-table-column label="单据日期" prop="createTime"></el-table-column>
          <el-table-column label="状态" prop="status">
            <template slot-scope="scope">
              <el-tag :type="(scope.row.status) | statusFilterType">
--- a/src/views/inout/IoCreateBusOrder.vue
+++ b/src/views/inout/IoCreateBusOrder.vue
@ -392,7 +392,6 @@ export default {
      let query = {
        code: this.filterQuery.invCode,
        enabled: true,
-        vueType: "supDelivery",
      };
      getLocalJoinByUser(query)
        .then((response) => {
@ -425,7 +424,6 @@ export default {
    //获取订单列表
    getList() {
      this.loading = true;
-      this.filterQuery.vueType = "supDelivery";
      getOrderList(this.filterQuery)
        .then((response) => {
          this.loading = false;
--- a/src/views/inout/receive/DialogNewReceive.vue
+++ b/src/views/inout/receive/DialogNewReceive.vue
@ -94,6 +94,12 @@
              <el-input v-model="formData.remark" auto-complete="off"></el-input>
            </el-form-item>
          </el-col>
+
+          <el-col v-if="formData.status==4" :span="11">
+            <el-form-item prop="remark" label="拒绝原因:">
+              <el-input :disabled="true" v-model="formData.auditRemark" auto-complete="off"></el-input>
+            </el-form-item>
+          </el-col>
        </el-row>
      </el-card>
      <el-card>
--- a/src/views/inout/receive/receiveAudit.vue
+++ b/src/views/inout/receive/receiveAudit.vue
@ -10,7 +10,7 @@
          </el-col>
          <el-col :span="8">
            <el-form-item label="领用仓库:">
-              <el-select v-model="filterQuery.targetInvCode" placeholder="请选择领用仓库" style="width: 100%;">
+              <el-select v-model="filterQuery.invCode" placeholder="请选择领用仓库" style="width: 100%;">
                <el-option
                  v-for="item in invList"
                  :key="item.code"
@ -243,7 +243,7 @@ export default {
        page: 1,
        limit: 10,
        corpName: null,
-        targetInvCode: this.invCodebe,
+        invCode: this.invCodebe,
        type: 2,
        editStatus: 2,
      };
@ -334,8 +334,8 @@ export default {
        .then((response) => {
          this.invList = response.data || [];
          if (this.invList.length > 0) {
-            this.filterQuery.targetInvCode = this.invList[0].code
-            this.invCodebe = this.filterQuery.targetInvCode
+            this.filterQuery.invCode = this.invList[0].code
+            this.invCodebe = this.filterQuery.invCode
          }
          this.getList();
        })
--- a/src/views/purchase/purApply/purApply.vue
+++ b/src/views/purchase/purApply/purApply.vue
@ -264,6 +264,7 @@ export default {
                targetDeptCode: this.invCodebe,
                targetInvCode:null
            };
+            this.initActDateRange()
            if(deptCode!=this.invCodebe){
              this.getInvList()
            }
@ -428,6 +429,13 @@ export default {
            this. getInvList();
          });
        },
+        initActDateRange(){
+          
+          let end = new Date();
+          let start = new Date();
+          start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+          this.actDateRange = [start, end];
+        }

    }
    ,
@ -450,10 +458,7 @@ export default {
    }
    ,
    created() {
-        let end = new Date();
-        let start = new Date();
-        start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-        this.actDateRange = [start, end];
+      this.initActDateRange()
        this.getDeptList();
    }
    ,
--- a/src/views/purchase/purApply/pureApplyAudit.vue
+++ b/src/views/purchase/purApply/pureApplyAudit.vue
@ -11,7 +11,9 @@

                <el-col :span="8">
                  <el-form-item label="申购部门">
-                    <el-select v-model="filterQuery.targetDeptCode" placeholder="请选择申购部门" style="width: 90%">
+                    <el-select v-model="filterQuery.targetDeptCode" placeholder="请选择申购部门" style="width: 90%"
+                      @change="getInvList"
+                    >
                      <el-option
                        v-for="item in deptList"
                        :key="item.code"
@ -26,7 +28,7 @@

                <el-col :span="8">
                  <el-form-item label="申购仓库">
-                    <el-select v-model="filterQuery.targetInvCode" @change="getInvList" style="width: 90%" clearable  placeholder="请选择所属仓库">
+                    <el-select v-model="filterQuery.targetInvCode" @change="getList" style="width: 90%" clearable  placeholder="请选择所属仓库">
                      <el-option
                        v-for="item in invList"
                        :key="item.name"
@ -167,6 +169,7 @@ export default {
                editStatus: 1,
                emergency:'',
                targetDeptCode:'',
+                targetInvCode: null
            },
            formName: null,
            formMap: {
@ -238,6 +241,7 @@ export default {
            this.$router.push({
                path: "",
            });
+            let deptCode = this.filterQuery.targetDeptCode
            this.filterQuery = {
                billNo: "",
                thirdSysFk: "",
@ -251,7 +255,11 @@ export default {
                type: 1,
                editStatus: 1,
                targetDeptCode: this.invCodebe,
+                targetInvCode: null
            };
+            if(deptCode!=this.invCodebe){
+              this.getInvList()
+            }
            this.actDateRange = [];
            this.getList();
        },
@ -370,10 +378,16 @@ export default {
                this.formName = "add";
            this.newSpDistributionVisible = true;
        },
+        deptChange(){
+
+          this. getInvList();
+          this.getList();
+        },
      getInvList() {
        var query={
          parentId:this.filterQuery.targetDeptCode
        }
+        this.filterQuery.targetInvCode = null
        filterSubAll(query).then((res) => {
          this.invList = res.data || [];
        })
@ -385,8 +399,8 @@ export default {
            this.filterQuery.targetDeptCode=this.deptList[0].code
            this.invCodebe=this.filterQuery.targetDeptCode
          }
-          this.getList();
          this. getInvList();
+          this.getList();
        });
      },
    }
--- a/src/views/purchase/purApply/pureApplySearch.vue
+++ b/src/views/purchase/purApply/pureApplySearch.vue
@ -311,6 +311,7 @@ export default {
        targetDeptCode: this.invCodebe,
      };
      this.actDateRange = [];
+      this.actAuditDateRange = [];
      this.getList();
    },

@ -330,10 +331,10 @@ export default {
        this.filterQuery.endDate = null;
      }
      if (this.actAuditDateRange != null) {
-        this.filterQuery.starAuditDate = this.actAuditDateRange[0];
+        this.filterQuery.startAuditDate = this.actAuditDateRange[0];
        this.filterQuery.endAuditDate = this.actAuditDateRange[1];
      } else {
-        this.filterQuery.starAuditDate = null;
+        this.filterQuery.startAuditDate = null;
        this.filterQuery.endAuditDate = null;
      }
      this.loading = true;
--- a/src/views/purchase/purOrder/purOrder.vue
+++ b/src/views/purchase/purOrder/purOrder.vue
@ -262,6 +262,7 @@ export default {
        deptCode: this.invCodebe,
      };
      this.actDateRange = [];
+      this.getInvList();
      this.getList();
    },
    handleClose() {
--- a/src/views/purchase/purOrder/purOrderAudit.vue
+++ b/src/views/purchase/purOrder/purOrderAudit.vue
@ -26,7 +26,7 @@

          <el-col :span="8">
            <el-form-item label="采购仓库">
-              <el-select v-model="filterQuery.targetInvCode" clearable style="width: 90%"  placeholder="请选择所属仓库">
+              <el-select v-model="filterQuery.invCode" clearable style="width: 90%"  placeholder="请选择所属仓库">
                <el-option
                  v-for="item in invList"
                  :key="item.name"
@ -257,6 +257,7 @@ export default {
        deptCode: this.invCodebe,
      };
      this.actDateRange = [];
+      this.getInvList();
      this.getList();
    },

--- a/src/views/purchase/purOrder/purOrderSearch.vue
+++ b/src/views/purchase/purOrder/purOrderSearch.vue
@ -209,9 +209,9 @@ export default {
        4: "已拒绝"
      },
      emergencyMap: {
-        1: "普通",
-        2: "紧急",
-        3: "不紧急",
+        1: "正常",
+        2: "较急",
+        3: "特急",
      },
      invList: {},
      deptList: {},
@ -314,7 +314,9 @@ export default {
        editStatus: 1,
        deptCode: this.invCodebe,
      };
+      this.actAuditDateRange = [];
      this.actDateRange = [];
+      this.getInvList();
      this.getList();
    },

@ -338,10 +340,10 @@ export default {
        this.filterQuery.endDate = null;
      }
      if (this.actAuditDateRange != null) {
-        this.filterQuery.starAuditDate = this.actAuditDateRange[0];
+        this.filterQuery.startAuditDate = this.actAuditDateRange[0];
        this.filterQuery.endAuditDate = this.actAuditDateRange[1];
      } else {
-        this.filterQuery.starAuditDate = null;
+        this.filterQuery.startAuditDate = null;
        this.filterQuery.endAuditDate = null;
      }
      this.loading = true;
--- a/src/views/purchase/purOrder/purOrderSearchDetails.vue
+++ b/src/views/purchase/purOrder/purOrderSearchDetails.vue
@ -4,7 +4,7 @@
      <el-form :model="filterQuery" class="query-form" label-width="100px" v-show="showSearch">
        <el-row>
          <el-col :span="6">
-            <el-form-item label="申购单号:">
+            <el-form-item label="采购单号:">
              <el-input v-model="filterQuery.billNo" style="width: 90%" placeholder="请输入单据号" clearable></el-input>
            </el-form-item>
          </el-col>
@ -75,11 +75,11 @@

      <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row>
        <el-table-column label="序号" type="index" width="60"></el-table-column>
-        <el-table-column label="申购单号" prop="billNo"></el-table-column>
+        <el-table-column label="采购单号" prop="billNo"></el-table-column>
        <el-table-column label="DI/物资编码" prop="productId"></el-table-column>
        <el-table-column label="物资名称" prop="productName"></el-table-column>
        <el-table-column label="规格型号" prop="spec"></el-table-column>
-        <el-table-column label="申购数量" prop="count"></el-table-column>
+        <el-table-column label="采购数量" prop="count"></el-table-column>
        <el-table-column label="计量单位" prop="measname"></el-table-column>
        <el-table-column label="供应商" prop="supName"></el-table-column>
        <el-table-column label="生产企业" prop="manufactory"></el-table-column>
--- a/src/views/purchase/purPlan/purPlan.vue
+++ b/src/views/purchase/purPlan/purPlan.vue
@ -179,6 +179,7 @@ export default {
        editStatus: 1,
        emergency:'',
        deptCode:'',
+        invCode:null
      },
      invCodebe:null,
      formName: null,
@ -262,8 +263,10 @@ export default {
        type: 1,
        editStatus: 1,
        deptCode: this.invCodebe,
+        invCode:null
      };
      this.actDateRange = [];
+      this.getInvList()
      this.getList();
    },
    handleClose() {
@ -406,6 +409,7 @@ export default {
      var query={
        parentId:this.filterQuery.deptCode
      }
+      this.filterQuery.invCode = null
      filterSubAll(query).then((res) => {
        this.invList = res.data || [];
      })
--- a/src/views/purchase/purPlan/purPlanAudit.vue
+++ b/src/views/purchase/purPlan/purPlanAudit.vue
@ -26,7 +26,7 @@

          <el-col :span="8">
            <el-form-item label="采购仓库">
-              <el-select v-model="filterQuery.targetInvCode" style="width: 90%"  placeholder="请选择所属仓库">
+              <el-select v-model="filterQuery.invCode" style="width: 90%"  placeholder="请选择所属仓库">
                <el-option
                  v-for="item in invList"
                  :key="item.name"
@ -172,7 +172,8 @@ export default {
        type: 1,
        editStatus: 1,
        emergency:'',
-        deptCode:'',
+        deptCode:'',   
+        invCode:null
      },
      formName: null,
      formMap: {
@ -186,9 +187,9 @@ export default {
        4: "已拒绝"
      },
      emergencyMap: {
-        1: "普通",
-        2: "紧急",
-        3: "不紧急",
+        1: "正常",
+        2: "较急",
+        3: "特急",
      },
      invList: {},
      deptList: {},
@ -256,8 +257,10 @@ export default {
        corpName: null,
        type: 1,
        editStatus: 1,
-        deptCode: this.invCodebe,
+        deptCode: this.invCodebe,        
+        invCode:null
      };
+      this.getInvList()
      this.actDateRange = [];
      this.getList();
    },
@ -359,6 +362,7 @@ export default {
      var query={
        parentId:this.filterQuery.deptCode
      }
+      this.filterQuery.invCode = null
      filterSubAll(query).then((res) => {
        this.invList = res.data || [];
      })
--- a/src/views/purchase/purPlan/purPlanSearch.vue
+++ b/src/views/purchase/purPlan/purPlanSearch.vue
@ -328,10 +328,10 @@ export default {
        this.filterQuery.endDate = null;
      }
      if (this.actAuditDateRange != null) {
-        this.filterQuery.starAuditDate = this.actAuditDateRange[0];
+        this.filterQuery.startAuditDate = this.actAuditDateRange[0];
        this.filterQuery.endAuditDate = this.actAuditDateRange[1];
      } else {
-        this.filterQuery.starAuditDate = null;
+        this.filterQuery.startAuditDate = null;
        this.filterQuery.endAuditDate = null;
      }
      this.loading = true;
--- a/src/views/purchase/purPlan/purPlanSearchDetails.vue
+++ b/src/views/purchase/purPlan/purPlanSearchDetails.vue
@ -4,7 +4,7 @@
      <el-form :model="filterQuery" class="query-form" label-width="100px" v-show="showSearch">
        <el-row>
          <el-col :span="6">
-            <el-form-item label="申购单号:">
+            <el-form-item label="采购单号:">
              <el-input v-model="filterQuery.billNo" style="width: 90%" placeholder="请输入单据号" clearable></el-input>
            </el-form-item>
          </el-col>
@ -75,11 +75,11 @@

      <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row>
        <el-table-column label="序号" type="index" width="60"></el-table-column>
-        <el-table-column label="申购单号" prop="billNo"></el-table-column>
+        <el-table-column label="采购单号" prop="billNo"></el-table-column>
        <el-table-column label="DI/物资编码" prop="productId"></el-table-column>
        <el-table-column label="物资名称" prop="productName"></el-table-column>
        <el-table-column label="规格型号" prop="spec"></el-table-column>
-        <el-table-column label="申购数量" prop="count"></el-table-column>
+        <el-table-column label="采购数量" prop="count"></el-table-column>
        <el-table-column label="计量单位" prop="measname"></el-table-column>
        <el-table-column label="供应商" prop="supName"></el-table-column>
        <el-table-column label="生产企业" prop="manufactory"></el-table-column>
--- a/src/views/system/dept/invRelUsers.vue
+++ b/src/views/system/dept/invRelUsers.vue
@ -208,7 +208,7 @@ export default {
      };
      this.loadUserList();
    },
-    loadUserList() {   //获取仓库用户列表
+    loadUserList() {   //获取仓库用户列表//下面方框重置按钮
      // if (val != null) {
      //   this.userQuery.page = val;
      // }
@ -324,7 +324,7 @@ export default {
  },
  created() {
    this.userQuery.code = this.inputQuery.code;
-    this.loadUserList();
+    //this.loadUserList();//不让前端一开始就去就展示数据

  }
 }
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@ -66,14 +66,14 @@
        <el-table-column label="操作" align="center">
          <template slot-scope="scope">
            <el-button
-              :disabled="scope.row.roleId === 1"
+              :disabled="scope.row.roleId == 1"
              type="text"
              @click="handleUpdate(scope.row)"
            >编辑
            </el-button>
            <el-button
              type="text"
-              :disabled="scope.row.roleId === 1"
+              :disabled="scope.row.roleId == 1"
              @click="handleDelete(scope.row)"
            >删除
            </el-button>
@ -543,9 +543,13 @@ export default {
              return
            }
            updateRole(this.form).then(response => {
+              if(response.code === 20000){
              this.$modal.msgSuccess("修改成功");
              this.open = false;
              this.getList();
+              }else{
+                this.$message.error(response.message);
+              }
            });
          } else {
            this.form.menuIds = this.getMenuAllCheckedKeys();