采购订单按供应商创建

2 years ago · 2b2b45cb78
parent 7bba144dc2
commit 2b2b45cb78
2 changed files with 419 additions and 343 deletions
--- a/src/views/purchase/purOrder/purOrderEditDialog.vue
+++ b/src/views/purchase/purOrder/purOrderEditDialog.vue
@ -74,16 +74,44 @@
              </el-select>
            </el-form-item>
          </el-col>
+
          <el-col :span="11">
-            <el-form-item label="采购说明:" prop="billNo">
-              <el-input v-model="formData.remark" auto-complete="off" type="textarea" autosize></el-input>
+            <el-form-item
+              prop="supId"
+              label="供应商:"
+            >
+              <el-select
+                v-model="formData.supId"
+                filterable
+                remote
+                :disabled="corpOrderIdDisabled"
+                clearable
+                reserve-keyword
+                style="width: 90%"
+                placeholder="请选择供应商"
+                :remote-method="findMethod"
+              >
+                <el-option
+                  v-for="item in fromOptions"
+                  :key="item.erpId"
+                  :label="item.name"
+                  :value="item.erpId"
+                >
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
            </el-form-item>
          </el-col>
-        </el-row>
-


+        </el-row>
        <el-row>
+          <el-col :span="11">
+            <el-form-item label="采购说明:" prop="remark">
+              <el-input v-model="formData.remark" auto-complete="off" type="textarea" autosize></el-input>
+            </el-form-item>
+          </el-col>
+
          <el-col :span="11" v-show="formData.status==4">
            <el-form-item label="拒绝原因:">
              <el-input v-model="formData.auditRemark" auto-complete="off" :disabled="true"></el-input>
@ -91,14 +119,16 @@
          </el-col>

        </el-row>
+
      </el-card>

+
      <el-card>
        <el-row type="flex" justify="end">
          <el-button-group style="display: flex">
            <el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px">
              <el-button type="primary" @click.native.stop="selectProductFunction()" :loading="loading">产品录入</el-button>
-<!--              <el-button type="primary" :loading="loading" @click.native.stop="selectApply()">选入采购单</el-button>-->
+              <!--              <el-button type="primary" :loading="loading" @click.native.stop="selectApply()">选入采购单</el-button>-->
            </el-button-group>


@ -151,6 +181,7 @@
        :closeDialog="closeDialogC2"
        :purType="1"
        :pId="pId"
+        :supId="formData.supId"
        :data="thisData"
      ></purOrderProducts>
    </el-dialog>
@ -187,6 +218,7 @@ import {
 import {filterSubByInv} from "@/api/system/invSubWarehouse";
 import SelectPlanListDialog from "@/views/purchase/purPlan/selectPlanListDialog";
 import {parseTime} from "@/utils/coTools";
+import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";

 export default {
  name: "idQuery",
@ -221,9 +253,11 @@ export default {
        deptCode: null,
        locStorageCode: null,
        invWarehouseCode: null,
+        supId: null,
      },
      pId: null,
      formRules: {},
+      fromOptions: [],
      codeArray: [],
      total: 0,
      loading: false,
@ -254,7 +288,9 @@ export default {
      storageList: [],
      invCodeList: [],
      invQueryData: {},
-      selectApplyVisible: false
+      selectApplyVisible: false,
+      corpOrderIdDisabled: false,
+
    };
  },
  watch: {
@ -341,6 +377,10 @@ export default {
        })
    },
    selectProductFunction() {
+      if (this.$isBlank(this.formData.supId)) {
+        this.$message.warning("请先选择供应商！");
+        return;
+      }
      this.selectProductVisible = true;
      //当父id为空的时候生成id
      if (this.pId == null) {
@ -365,9 +405,11 @@ export default {
      }
      selectOrderDetail(this.query) //查找该单号下的所有条码
        .then((response) => {
-          console.log(response)
          this.codeArray = response.data.list || [];
          this.total = response.data.total || 0;
+          if (this.total > 0) {
+            this.corpOrderIdDisabled = true;
+          }
          this.loading = false;
        })
        .catch(() => {
@ -482,6 +524,28 @@ export default {
        })
      }
    },
+
+
+    //获取往来单位候选列表
+    findMethod(query) {
+      this.fromOptions = [];
+      let cQuery = {
+        key: query,
+        corpType: 2,
+        outType: null,
+        page: 1,
+        limit: 20,
+      };
+      getBasicUnitMaintains(cQuery)
+        .then((response) => {
+          this.loading = false;
+          this.fromOptions = response.data.list || [];
+        })
+        .catch(() => {
+          this.loading = false;
+        });
+    },
+
  },
  filters: {},
  mounted() {
@ -499,7 +563,9 @@ export default {
      this.formData = this.idQuery.formData;
      this.orderEditor = true;
      this.sValue = this.formData.corpName;
+      this.findMethod(this.formData.supId);
      this.getStockOrderDetailList();
+      this.corpOrderIdDisabled = true;
    } else {
      var date = new Date();
      this.formData = {
--- a/src/views/purchase/purOrder/purOrderSelectProduct.vue
+++ b/src/views/purchase/purOrder/purOrderSelectProduct.vue
@ -5,12 +5,14 @@
        <el-row>
          <el-col :span="12">
            <el-form-item label="UDI码:" class="query-form-item">
-                            <el-input v-model="listQuery.udiCode" style="width: 96%" placeholder="请扫描或输入UDI码" clearable="true" @keyup.enter.native="keyup_submit($event)"></el-input>
+              <el-input v-model="listQuery.udiCode" style="width: 96%" placeholder="请扫描或输入UDI码" clearable="true"
+                        @keyup.enter.native="keyup_submit($event)"></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="6">
            <el-form-item label="第三方物资编码:" class="query-form-item">
-                         <el-input v-model="listQuery.thrPiId" style="width: 90%" placeholder="请输入第三方物资编码" clearable="true"></el-input>
+              <el-input v-model="listQuery.thrPiId" style="width: 90%" placeholder="请输入第三方物资编码"
+                        clearable="true"></el-input>
            </el-form-item>
          </el-col>
        </el-row>
@ -18,12 +20,14 @@
        <el-row>
          <el-col :span="6">
            <el-form-item label="物品编码:" class="query-form-item">
-                            <el-input v-model="listQuery.unionCode" style="width: 90%" placeholder="请输入DI/医保编码/商品条码" clearable="true"></el-input>
+              <el-input v-model="listQuery.unionCode" style="width: 90%" placeholder="请输入DI/医保编码/商品条码"
+                        clearable="true"></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="6">
            <el-form-item label="产品通用名:" class="query-form-item">
-                            <el-input v-model="listQuery.cpmctymc" style="width: 90%"  placeholder="请输入产品通用名" clearable="true"></el-input>
+              <el-input v-model="listQuery.cpmctymc" style="width: 90%" placeholder="请输入产品通用名"
+                        clearable="true"></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="6">
@ -50,7 +54,8 @@
      </div>
      <el-divider style="margin: 15px"></el-divider>

-                <el-table :data="dataList" style="width: 100%"  v-loading="loading" border highlight-current-row :row-class-name="tableRowClassName" @current-change="handleChange" ref="multipleTable">
+      <el-table :data="dataList" style="width: 100%" v-loading="loading" border highlight-current-row
+                :row-class-name="tableRowClassName" @current-change="handleChange" ref="multipleTable">
        <el-table-column label width="45">
          <template slot-scope="scope">
            <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
@ -137,6 +142,10 @@ export default {
      type: Object,
      required: true,
    },
+    supId: {
+      type: Object,
+      required: true,
+    },
  },

  data() {
@ -159,7 +168,7 @@ export default {
        erpName: "",
        keys: [],
      },
-            ids:[],
+      ids: [],
      radioCheck: null,
      dataList: [],
      pageTotal: 1,
@ -271,6 +280,7 @@ export default {
    getList() {
      this.loading = true;
      this.listQuery.customerId = store.getters.customerId;
+      this.listQuery.unitFk = this.supId;
      filterCompanyProductRelevance(this.listQuery)
        .then((response) => {
          this.loading = false;
@ -300,9 +310,9 @@ export default {
        return;
      }

-            if(this.ids.length>0){
-                for(var i=0;i<this.ids.length;i++){
-                   if(this.ids[i]==this.multipleSelection.rlId){
+      if (this.ids.length > 0) {
+        for (var i = 0; i < this.ids.length; i++) {
+          if (this.ids[i] == this.multipleSelection.rlId) {
            this.$message.error("该产品已录入！");
            return
          }
@ -321,12 +331,12 @@ export default {
    combine() {
      this.loading = true;
      let tQuery = {
-              productId:this.multipleSelection.rlId,
-              productName:this.multipleSelection.cpmctymc,
-              count:1,
-              orderIdFk:this.pId,
-              supId:this.multipleSelection.customerId,
-              zczbhhzbapzbh:this.multipleSelection.zczbhhzbapzbh
+        productId: this.multipleSelection.rlId,
+        productName: this.multipleSelection.cpmctymc,
+        count: 1,
+        orderIdFk: this.pId,
+        supId: this.multipleSelection.customerId,
+        zczbhhzbapzbh: this.multipleSelection.zczbhhzbapzbh
      };
      addOrderDetail(tQuery).then((response) => {
        this.loading = false;
@ -349,7 +359,7 @@ export default {
    selectCert() {
      if (this.currentCert == null) {
        this.$message.error("请先选择对应的注册证！");
-            }else{
+      } else {
        this.multipleSelection.zczbhhzbapzbh = this.currentCert;
        this.combine();
      }
@ -361,9 +371,9 @@ export default {
  created() {
    console.log(this.data)
    if (this.$isNotBlank(this.data)) {
-            this.ids=[];
-            if(this.data.stockOrderLists.length>0){
-                for(var i=0;i<this.data.stockOrderLists.length;i++){
+      this.ids = [];
+      if (this.data.stockOrderLists.length > 0) {
+        for (var i = 0; i < this.data.stockOrderLists.length; i++) {
          this.ids.push(this.data.stockOrderLists[i].productId);
        }
      }