From 489040d1042ff7336ff50ae889f906b087b15a03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Wed, 7 Sep 2022 23:38:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E9=80=A0=E5=8D=95=E6=8D=AE=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84=E5=BA=8F=E5=88=97=E5=8F=B7=E8=BE=93=E5=85=A5=E6=A1=86?=
 =?UTF-8?q?=EF=BC=8C=E6=94=B9=E4=B8=BA=E5=8F=AF=E4=BB=A5=E4=BB=8E=E5=BC=B9?=
 =?UTF-8?q?=E5=87=BA=E6=A1=86=E4=B8=AD=E8=BE=93=E5=85=A5=EF=BC=88=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E9=BB=98=E8=AE=A4=E8=BE=93=E5=85=A5=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/jeecg/minipop/JInputPop.vue    | 197 +++++++++---------
 .../src/views/bill/modules/OtherInModal.vue   |   2 +-
 .../views/bill/modules/PurchaseInModal.vue    |   2 +-
 .../views/bill/modules/RetailBackModal.vue    |   2 +-
 .../src/views/bill/modules/SaleBackModal.vue  |   2 +-
 5 files changed, 104 insertions(+), 101 deletions(-)

diff --git a/jshERP-web/src/components/jeecg/minipop/JInputPop.vue b/jshERP-web/src/components/jeecg/minipop/JInputPop.vue
index 2021fd38..d17195fe 100644
--- a/jshERP-web/src/components/jeecg/minipop/JInputPop.vue
+++ b/jshERP-web/src/components/jeecg/minipop/JInputPop.vue
@@ -1,98 +1,101 @@
-<template>
-  <a-popover trigger="contextmenu" v-model="visible" :placement="position">
-    <!--"(node) => node.parentNode.parentNode"-->
-    <div slot="title">
-      <span>{{ title }}</span>
-      <span style="float: right" title="关闭">
-        <a-icon type="close" @click="visible=false"/>
-      </span>
-    </div>
-    <a-input :value="inputContent" @change="handleInputChange">
-      <a-icon slot="suffix" type="fullscreen" @click.stop="pop" />
-    </a-input>
-    <div slot="content">
-      <textarea :value="inputContent" @input="handleInputChange" :style="{ height: height + 'px', width: width + 'px' }"></textarea>
-    </div>
-  </a-popover>
-</template>
-
-<script>
-  export default {
-    name: 'JInputPop',
-    props:{
-      title:{
-        type:String,
-        default:'',
-        required:false
-      },
-      position:{
-        type:String,
-        default:'right',
-        required:false
-      },
-      height:{
-        type:Number,
-        default:200,
-        required:false
-      },
-      width:{
-        type:Number,
-        default:150,
-        required:false
-      },
-      value:{
-        type:String,
-        required:false
-      },
-      popContainer:{
-        type:String,
-        default:'',
-        required:false
-      }
-
-    },
-    data(){
-      return {
-        visible:false,
-        inputContent:''
-
-      }
-    },
-
-    watch:{
-      value:{
-        immediate:true,
-        handler:function(){
-          if(this.value && this.value.length>0){
-            this.inputContent = this.value;
-          }
-        }
-      },
-    },
-    model: {
-      prop: 'value',
-      event: 'change'
-    },
-    methods:{
-      handleInputChange(event){
-        this.inputContent = event.target.value
-        this.$emit('change',this.inputContent)
-      },
-      pop(){
-        this.visible=true
-      },
-      getPopupContainer(node){
-        if(!this.popContainer){
-          return node.parentNode
-        }else{
-          return document.getElementById(this.popContainer)
-        }
-
-      }
-    }
-  }
-</script>
-
-<style scoped>
-
+<template>
+  <a-popover trigger="contextmenu" v-model="visible" :placement="position">
+    <!--"(node) => node.parentNode.parentNode"-->
+    <div slot="title">
+      <span>{{ title }}</span>
+      <span style="float: right" title="关闭">
+        <a-icon type="close" @click="visible=false"/>
+      </span>
+    </div>
+    <a-input :value="inputContent" @change="handleInputChange" :placeholder="placeholder">
+      <a-icon slot="suffix" type="fullscreen" @click.stop="pop" />
+    </a-input>
+    <div slot="content">
+      <textarea :value="inputContent" @input="handleInputChange" :placeholder="placeholder" :style="{ height: height + 'px', width: width + 'px' }"></textarea>
+    </div>
+  </a-popover>
+</template>
+
+<script>
+  export default {
+    name: 'JInputPop',
+    props:{
+      title:{
+        type:String,
+        default:'',
+        required:false
+      },
+      position:{
+        type:String,
+        default:'right',
+        required:false
+      },
+      height:{
+        type:Number,
+        default:200,
+        required:false
+      },
+      width:{
+        type:Number,
+        default:150,
+        required:false
+      },
+      value:{
+        type:String,
+        required:false
+      },
+      popContainer:{
+        type:String,
+        default:'',
+        required:false
+      },
+      placeholder:{
+        type:String,
+        required:false
+      },
+    },
+    data(){
+      return {
+        visible:false,
+        inputContent:''
+
+      }
+    },
+
+    watch:{
+      value:{
+        immediate:true,
+        handler:function(){
+          if(this.value && this.value.length>0){
+            this.inputContent = this.value;
+          }
+        }
+      },
+    },
+    model: {
+      prop: 'value',
+      event: 'change'
+    },
+    methods:{
+      handleInputChange(event){
+        this.inputContent = event.target.value
+        this.$emit('change',this.inputContent)
+      },
+      pop(){
+        this.visible=true
+      },
+      getPopupContainer(node){
+        if(!this.popContainer){
+          return node.parentNode
+        }else{
+          return document.getElementById(this.popContainer)
+        }
+
+      }
+    }
+  }
+</script>
+
+<style scoped>
+
 </style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/bill/modules/OtherInModal.vue b/jshERP-web/src/views/bill/modules/OtherInModal.vue
index 651e17f6..e03be559 100644
--- a/jshERP-web/src/views/bill/modules/OtherInModal.vue
+++ b/jshERP-web/src/views/bill/modules/OtherInModal.vue
@@ -172,7 +172,7 @@
             { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal },
             { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal },
             { title: '单位', key: 'unit', width: '4%', type: FormTypes.normal },
-            { title: '序列号', key: 'snList', width: '12%', type: FormTypes.input, placeholder: '多个序列号请用逗号隔开',
+            { title: '序列号', key: 'snList', width: '12%', type: FormTypes.input, placeholder: '多个序列号用逗号隔开',
               validateRules: [{ pattern: /^\S{1,100}$/, message: '请小于100位字符' }]
             },
             { title: '批号', key: 'batchNumber', width: '5%', type: FormTypes.input },
diff --git a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
index dd5aa1c6..2199e8b4 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
@@ -269,7 +269,7 @@
             { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal },
             { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal },
             { title: '单位', key: 'unit', width: '4%', type: FormTypes.normal },
-            { title: '序列号', key: 'snList', width: '12%', type: FormTypes.input, placeholder: '多个序列号请用逗号隔开',
+            { title: '序列号', key: 'snList', width: '12%', type: FormTypes.input, placeholder: '多个序列号用逗号隔开',
               validateRules: [{ pattern: /^\S{1,100}$/, message: '请小于100位字符' }]
             },
             { title: '批号', key: 'batchNumber', width: '5%', type: FormTypes.input },
diff --git a/jshERP-web/src/views/bill/modules/RetailBackModal.vue b/jshERP-web/src/views/bill/modules/RetailBackModal.vue
index 97b2e861..467e354c 100644
--- a/jshERP-web/src/views/bill/modules/RetailBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/RetailBackModal.vue
@@ -231,7 +231,7 @@
             { title: '扩展信息', key: 'materialOther', width: '7%', type: FormTypes.normal },
             { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal },
             { title: '单位', key: 'unit', width: '5%', type: FormTypes.normal },
-            { title: '序列号', key: 'snList', width: '12%', type: FormTypes.input, placeholder: '多个序列号请用逗号隔开',
+            { title: '序列号', key: 'snList', width: '12%', type: FormTypes.input, placeholder: '多个序列号用逗号隔开',
               validateRules: [{ pattern: /^\S{1,100}$/, message: '请小于100位字符' }]
             },
             { title: '批号', key: 'batchNumber', width: '7%', type: FormTypes.input },
diff --git a/jshERP-web/src/views/bill/modules/SaleBackModal.vue b/jshERP-web/src/views/bill/modules/SaleBackModal.vue
index 6fa6f84a..eebb6480 100644
--- a/jshERP-web/src/views/bill/modules/SaleBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/SaleBackModal.vue
@@ -247,7 +247,7 @@
             { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal },
             { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal },
             { title: '单位', key: 'unit', width: '4%', type: FormTypes.normal },
-            { title: '序列号', key: 'snList', width: '12%', type: FormTypes.input, placeholder: '多个序列号请用逗号隔开',
+            { title: '序列号', key: 'snList', width: '12%', type: FormTypes.input, placeholder: '多个序列号用逗号隔开',
               validateRules: [{ pattern: /^\S{1,100}$/, message: '请小于100位字符' }]
             },
             { title: '批号', key: 'batchNumber', width: '5%', type: FormTypes.input },