From cb60883b26e26bc0be104413c8285c2510cf459f Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Wed, 14 Jun 2023 11:37:06 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=B3=E8=B4=AD=E6=96=B0=E5=A2=9E=E5=A4=87?=
 =?UTF-8?q?=E6=B3=A8=E5=AD=97=E6=AE=B5=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchase/purApply/purApplyEditDiaolog.vue |  6 +-
 .../purApply/purOrderSelectProduct.vue        | 59 ++++++++++++++-----
 .../purOrder/purOrderSelectProduct.vue        | 10 +++-
 3 files changed, 55 insertions(+), 20 deletions(-)

diff --git a/src/views/purchase/purApply/purApplyEditDiaolog.vue b/src/views/purchase/purApply/purApplyEditDiaolog.vue
index 2ceb8074..98b30516 100644
--- a/src/views/purchase/purApply/purApplyEditDiaolog.vue
+++ b/src/views/purchase/purApply/purApplyEditDiaolog.vue
@@ -97,7 +97,7 @@
           <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>
           </el-button-group>
         </el-row>
@@ -297,7 +297,7 @@ export default {
             if (this.formData.arrivalTime == "" || this.formData.arrivalTime == null) {
               return this.$message.error("到货时间不能为空！");
             }
-            if (this.formData.arrivalTime<this.formData.createTime) {
+            if (this.formData.arrivalTime < this.formData.createTime) {
               return this.$message.error("到货时间不能比单据日期早！！！");
             }
             for (let i = 0; i < this.codeArray.length; i++) {
@@ -426,7 +426,7 @@ export default {
       }
     },
     deleteCodeArray(index, row) {
-      this.orderEditor=true;
+      this.orderEditor = true;
       this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
diff --git a/src/views/purchase/purApply/purOrderSelectProduct.vue b/src/views/purchase/purApply/purOrderSelectProduct.vue
index fe7f6b12..70ec42db 100644
--- a/src/views/purchase/purApply/purOrderSelectProduct.vue
+++ b/src/views/purchase/purApply/purOrderSelectProduct.vue
@@ -3,7 +3,7 @@
     <el-card class="el-card">
       <el-form :model="listQuery" label-width="120px" v-show="showSearch">
         <el-row>
-          <el-col :span="15">
+          <el-col :span="18">
             <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>
@@ -12,26 +12,26 @@
         </el-row>
         <el-row>
           <el-col :span="6">
-            <el-form-item label="物资简称:" class="query-form-item">
-              <el-input v-model="listQuery.pinyinInitial" @input="search" style="width: 90%" placeholder="请输入物资拼音简写"
+            <el-form-item label="拼音简写:" class="query-form-item">
+              <el-input v-model="listQuery.pinyinInitial" @input="search" style="width: 100%" placeholder="请输入物资拼音简写"
                         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.thrPiId" style="width: 90%" placeholder="第三方物资编码"
+              <el-input v-model="listQuery.thrPiId" style="width: 100%" placeholder="第三方物资编码"
                         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.flbm" style="width: 90%" placeholder="请输入分类编码"
+              <el-input v-model="listQuery.flbm" style="width: 100%" placeholder="请输入分类编码"
                         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.companyName" style="width: 90%" placeholder="请输入供应商"
+              <el-input v-model="listQuery.companyName" style="width: 100%" placeholder="请输入供应商"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
@@ -39,24 +39,39 @@
         <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/医保编码/商品条码"
+              <el-input v-model="listQuery.unionCode" style="width: 100%" 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="请输入产品通用名"
+              <el-input v-model="listQuery.cpmctymc" style="width: 100%" placeholder="请输入产品通用名"
                         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.ggxh" style="width: 90%" placeholder="请输入规格型号" clearable="true"></el-input>
+              <el-input v-model="listQuery.ggxh" style="width: 100%" placeholder="请输入规格型号" 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.manufactory" style="width: 90%" placeholder="请输入生产企业/注册备案人"
+              <el-input v-model="listQuery.manufactory" style="width: 100%" placeholder="请输入生产企业/注册备案人"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="6" v-if="productRemarkSet.remarkEnable1">
+            <el-form-item :label="productRemarkSet.remarkTitle1+':'" class="query-form-item">
+              <el-input v-model="listQuery.basicPrductRemak1" style="width: 100%" :placeholder="productRemarkSet.remarkTitle1"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6" v-if="productRemarkSet.remarkEnable2">
+            <el-form-item :label="productRemarkSet.remarkTitle2 +':'" class="query-form-item">
+              <el-input v-model="listQuery.basicPrductRemak2" style="width: 100%" :placeholder="productRemarkSet.remarkTitle2"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
@@ -109,7 +124,6 @@
       ></pagination>
     </el-card>
 
-
     <el-dialog
       title="耗材字典详情"
       :visible.sync="udiRlDetailVisible"
@@ -126,7 +140,10 @@
       <el-form :model="form">
         <el-form-item label="" prop="isGive">
           <el-radio-group v-model="currentCert">
-            <el-radio style="width: 100%;  margin-top: 10px;"  :label="item" :key="item" v-for="item in certList">{{ item }}</el-radio>
+            <el-radio style="width: 100%;  margin-top: 10px;" :label="item" :key="item" v-for="item in certList">{{
+                item
+              }}
+            </el-radio>
           </el-radio-group>
         </el-form-item>
       </el-form>
@@ -144,6 +161,7 @@ import {filterCompanyProductplanRelevance, filterCompanyProductRelevance} from "
 import {addApplyDetail, addApply} from "../../../api/purchase/purApply";
 import store from "../../../store";
 import udiRlDetailDialog from "./../../purchase/purApply/purUdiRlDetailDialog";
+import {finProductSet} from "@/api/param/systemParamConfig";
 
 export default {
   name: "stockOrderNewSelectProduct",
@@ -211,6 +229,7 @@ export default {
         orderIdFk: "",
         supId: "",
       },
+      productRemarkSet: {},
       pickerOptions: {
         shortcuts: [
           {
@@ -401,13 +420,19 @@ export default {
         this.multipleSelection.zczbhhzbapzbh = this.currentCert;
         this.combine();
       }
-
+    },
+    findBasicProductSet() {
+      finProductSet().then((response) => {
+        if (response.code == 20000) {
+          this.productRemarkSet = response.data;
+        }
+      });
     },
   },
   components: {udiRlDetailDialog},
 
   created() {
-    console.log(this.data)
+    this.findBasicProductSet();
     if (this.$isNotBlank(this.data)) {
       this.ids = [];
       if (this.data.stockOrderLists.length > 0) {
@@ -416,13 +441,17 @@ export default {
         }
       }
     }
-
   },
 };
 </script>
 
 <style scoped>
 
+.query-form-item {
+  display: block !important;
+  margin-right: 1px;
+  margin-bottom: 5px;
+}
 
 div /deep/ .el-table .warning-row {
   background: #bebebe;
diff --git a/src/views/purchase/purOrder/purOrderSelectProduct.vue b/src/views/purchase/purOrder/purOrderSelectProduct.vue
index dfd79c83..b7736608 100644
--- a/src/views/purchase/purOrder/purOrderSelectProduct.vue
+++ b/src/views/purchase/purOrder/purOrderSelectProduct.vue
@@ -116,7 +116,10 @@
       <el-form :model="form">
         <el-form-item label="" prop="isGive">
           <el-radio-group v-model="currentCert">
-            <el-radio style="width: 100%;  margin-top: 10px;"  :label="item" :key="item" v-for="item in certList">{{ item }}</el-radio>
+            <el-radio style="width: 100%;  margin-top: 10px;" :label="item" :key="item" v-for="item in certList">{{
+                item
+              }}
+            </el-radio>
           </el-radio-group>
         </el-form-item>
       </el-form>
@@ -175,6 +178,9 @@ export default {
         limit: 10,
         zczbhhzbapzbh: null,
         manufactory: null,
+
+        basicPrductRemak1: null,
+        basicPrductRemak2: null,
       },
       combineQuery: {
         thirdId: "",
@@ -351,7 +357,7 @@ export default {
         orderIdFk: this.pId,
         supId: this.multipleSelection.customerId,
         zczbhhzbapzbh: this.multipleSelection.zczbhhzbapzbh,
-        price:this.multipleSelection.price
+        price: this.multipleSelection.price
       };
       addOrderDetail(tQuery).then((response) => {
         this.loading = false;