Merge remote-tracking branch 'origin/dev' into dev

2 years ago · c4e3bd77df
parent 5c76856bf0 e450b6f4c0
commit c4e3bd77df
4 changed files with 96 additions and 106 deletions
--- a/src/views/inout/DialogCreateOrder.vue
+++ b/src/views/inout/DialogCreateOrder.vue
@ -196,7 +196,7 @@
            <el-form-item
              prop="fromCorp"
              label="往来信息:"
-              v-if="curAction.corpType == 1 && curAction.genUnit"
+              v-if="curAction.corpType == 1 && curAction.genUnit && orderQuery.billNo ==''"
            >
              <el-input
                v-model="orderFormData.fromCorp"
@ -207,6 +207,20 @@
                placeholder="请输入病人住院号"
              ></el-input>
            </el-form-item>
+            <el-form-item
+              prop="fromCorp"
+              label="往来信息:"
+              v-if="curAction.corpType == 1 && curAction.genUnit && orderQuery.billNo != ''"
+            >
+              <el-input
+                v-model="orderFormData.fromCorpName"
+                auto-complete="off"
+                clearable
+                style="width: 90%"
+                :disabled="corpOrderIdDisabled"
+                placeholder="请输入病人住院号"
+              ></el-input>
+            </el-form-item>
          </el-col>
          <el-col :span="11">
            <el-form-item prop="remark" label="备注:">
--- a/src/views/inventory/InvOrderPlaceModify.vue
+++ b/src/views/inventory/InvOrderPlaceModify.vue
@ -44,7 +44,7 @@
              v-model="formData.invSpaceName"
              :fetch-suggestions="querySearchAsync"
              placeholder="请输入内容"
-              :disabled="list.length > 0"
+              :disabled="list.length > 0 || formData.invCode === ''"
              ref="spaceInputRef"
              @select="handleSelect"
              @keypress.enter.native="spaceEnterKey($event)"
@ -53,6 +53,7 @@
            ></el-autocomplete>
          </el-form-item>
        </el-col>
+
      </el-row>

      <el-row>
--- a/src/views/purchase/purApply/pureApplyAudit.vue
+++ b/src/views/purchase/purApply/pureApplyAudit.vue
@ -9,37 +9,40 @@
            </el-form-item>
          </el-col>

-<!--          <el-col :span="8">-->
-<!--            <el-form-item label="申购部门">-->
-<!--              <el-select v-model="filterQuery.deptCode" placeholder="请选择申购部门" style="width: 90%"-->
-<!--                         @change="getInvList"-->
-<!--              >-->
-<!--                <el-option-->
-<!--                  v-for="item in deptList"-->
-<!--                  :key="item.code"-->
-<!--                  :label="item.name"-->
-<!--                  :value="item.code"-->
-<!--                >-->
-<!--                  <span style="float: left">{{ item.name }}</span>-->
-<!--                </el-option>-->
-<!--              </el-select>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
+          <el-col :span="8">
+            <el-form-item label="申购部门">
+              <el-select v-model="filterQuery.deptCode" placeholder="请选择申购部门" style="width: 90%"
+                         @change="getInvList"
+              >
+                <el-option
+                  v-for="item in deptList"
+                  :key="item.code"
+                  :label="item.name"
+                  :value="item.code"
+                >
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>

-<!--          <el-col :span="8">-->
-<!--            <el-form-item label="申购仓库">-->
-<!--              <el-select v-model="filterQuery.invCode" @change="getList" style="width: 90%" clearable-->
-<!--                         placeholder="请选择所属仓库">-->
-<!--                <el-option-->
-<!--                  v-for="item in invList"-->
-<!--                  :key="item.name"-->
-<!--                  :label="item.name"-->
-<!--                  :value="item.code">-->
-<!--                  <span style="float: left">{{ item.name }}</span>-->
-<!--                </el-option>-->
-<!--              </el-select>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
+          <el-col :span="8">
+            <el-form-item label="申购仓库">
+              <el-select v-model="filterQuery.invCode" @change="getList" style="width: 90%" clearable
+                         placeholder="请选择所属仓库">
+                <el-option
+                  v-for="item in invList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.code">
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
          <el-col :span="8">
            <el-form-item label="紧急程度：" prop="emergency">
              <el-select v-model="filterQuery.emergency" placeholder="请选择紧急程度" style="width: 90%" clearable>
@ -52,48 +55,20 @@
          <el-col :span="8">
            <el-form-item label="创建时间:">
              <el-date-picker
-                  :picker-options="pickerOptions"
-                  v-model="actDateRange"
-                  type="daterange"
-                  format="yyyy 年 MM 月 dd 日"
-                  style="width: 90%"
-                  value-format="yyyy-MM-dd"
-                  range-separator="至"
-                  start-placeholder="开始日期"
-                  end-placeholder="结束日期"
+                :picker-options="pickerOptions"
+                v-model="actDateRange"
+                type="daterange"
+                format="yyyy 年 MM 月 dd 日"
+                style="width: 90%"
+                value-format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
              >
              </el-date-picker>
            </el-form-item>
          </el-col>
        </el-row>
-
-<!--        <el-row>-->
-<!--          <el-col :span="8">-->
-<!--            <el-form-item label="紧急程度：" prop="emergency">-->
-<!--              <el-select v-model="filterQuery.emergency" placeholder="请选择紧急程度" style="width: 90%" clearable>-->
-<!--                <el-option label="正常" :value=1></el-option>-->
-<!--                <el-option label="较急" :value=2></el-option>-->
-<!--                <el-option label="特急" :value=3></el-option>-->
-<!--              </el-select>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--          <el-col :span="8">-->
-<!--            <el-form-item label="创建时间:">-->
-<!--              <el-date-picker-->
-<!--                :picker-options="pickerOptions"-->
-<!--                v-model="actDateRange"-->
-<!--                type="daterange"-->
-<!--                format="yyyy 年 MM 月 dd 日"-->
-<!--                style="width: 90%"-->
-<!--                value-format="yyyy-MM-dd"-->
-<!--                range-separator="至"-->
-<!--                start-placeholder="开始日期"-->
-<!--                end-placeholder="结束日期"-->
-<!--              >-->
-<!--              </el-date-picker>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--        </el-row>-->
      </el-form>

      <div class="top-right-btn">
@ -111,8 +86,8 @@
                :default-sort="defaultSort" @sort-change="handleSortChange">
        <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="targetDeptName"></el-table-column>
-        <el-table-column label="申购仓库" prop="targetInvName"></el-table-column>
+        <el-table-column label="申购部门" prop="deptName"></el-table-column>
+        <el-table-column label="申购仓库" prop="invName"></el-table-column>
        <el-table-column label="紧急程度" prop="emergency">
          <template slot-scope="scope">
            {{ emergencyMap[scope.row.emergency] }}
--- a/src/views/purchase/purApply/pureApplySearch.vue
+++ b/src/views/purchase/purApply/pureApplySearch.vue
@ -9,33 +9,36 @@
            </el-form-item>
          </el-col>

-<!--          <el-col :span="8">-->
-<!--            <el-form-item label="申购部门">-->
-<!--              <el-select v-model="filterQuery.deptCode" @change="getInvList" placeholder="请选择申购部门" style="width: 90%">-->
-<!--                <el-option-->
-<!--                  v-for="item in deptList"-->
-<!--                  :key="item.code"-->
-<!--                  :label="item.name"-->
-<!--                  :value="item.code"-->
-<!--                >-->
-<!--                  <span style="float: left">{{ item.name }}</span>-->
-<!--                </el-option>-->
-<!--              </el-select>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--          <el-col :span="8">-->
-<!--            <el-form-item label="申购仓库">-->
-<!--              <el-select v-model="filterQuery.invCode" style="width: 90%" clearable placeholder="请选择所属仓库">-->
-<!--                <el-option-->
-<!--                  v-for="item in invList"-->
-<!--                  :key="item.name"-->
-<!--                  :label="item.name"-->
-<!--                  :value="item.code">-->
-<!--                  <span style="float: left">{{ item.name }}</span>-->
-<!--                </el-option>-->
-<!--              </el-select>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
+          <el-col :span="8">
+            <el-form-item label="申购部门">
+              <el-select v-model="filterQuery.deptCode" clearable @change="getInvList" placeholder="请选择申购部门" style="width: 90%">
+                <el-option
+                  v-for="item in deptList"
+                  :key="item.code"
+                  :label="item.name"
+                  :value="item.code"
+                >
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="申购仓库">
+              <el-select v-model="filterQuery.invCode" style="width: 90%" clearable placeholder="请选择所属仓库">
+                <el-option
+                  v-for="item in invList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.code">
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
          <el-col :span="8">
            <el-form-item label="紧急程度：" prop="emergency">
              <el-select v-model="filterQuery.emergency" placeholder="请选择紧急程度" style="width: 90%" clearable>
@ -61,9 +64,6 @@
              </el-date-picker>
            </el-form-item>
          </el-col>
-        </el-row>
-
-        <el-row>
          <el-col :span="8">
            <el-form-item label="审核时间:">
              <el-date-picker
@ -170,7 +170,7 @@
 <script>
 import pureApplyDetail from "./pureApplyDetailDialog";
 import {delApply, auditOrder, listApplyDetail, auditListApply} from "@/api/purchase/purApply";
-import {getInvListByUser} from "@/api/system/invWarehouse";
+import {filterAll, getInvListByUser} from "@/api/system/invWarehouse";
 import {getDeptListByUser} from "@/api/auth/authDept";
 import {filterSubAll} from "@/api/system/invSubWarehouse";

@ -463,11 +463,11 @@ export default {
      })
    },
    getDeptList() {
-      getDeptListByUser().then((res) => {
+      filterAll().then((res) => {
        this.deptList = res.data || [];
        if (this.deptList.length > 0) {
-          this.filterQuery.targetDeptCode = this.deptList[0].code
-          this.invCodebe = this.filterQuery.targetDeptCode
+          this.filterQuery.deptCode = this.deptList[0].code
+          this.invCodebe = this.filterQuery.deptCode
        }
        this.getList();
        this.getInvList();
@ -495,7 +495,7 @@ export default {
  }
  ,
  created() {
-    this.getList();
+    this.getDeptList();
  }
  ,
 }