From 1043ee9b87927ee1f39813a85495ab58eda28c02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Tue, 13 Apr 2021 01:12:12 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E9=80=80=E8=B4=A7=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E9=94=80=E5=94=AE=E4=BB=A3=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/components/tools/UserPassword.vue    |  7 +++++--
 jshERP-web/src/views/bill/modules/SaleBackModal.vue | 12 ++++++++++--
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/jshERP-web/src/components/tools/UserPassword.vue b/jshERP-web/src/components/tools/UserPassword.vue
index b26daf82..721d6f2a 100644
--- a/jshERP-web/src/components/tools/UserPassword.vue
+++ b/jshERP-web/src/components/tools/UserPassword.vue
@@ -115,8 +115,11 @@
             console.log("修改密码提交数据",params)
             putAction(this.url,params).then((res)=>{
               if(res.code === 200){
-                console.log(res)
-                that.$message.success(res.data.message);
+                if(res.data.status === 2 || res.data.status === 3) {
+                  that.$message.warning(res.data.message);
+                } else {
+                  that.$message.success(res.data.message);
+                }
                 that.close();
               }else{
                 that.$message.warning(res.data.message);
diff --git a/jshERP-web/src/views/bill/modules/SaleBackModal.vue b/jshERP-web/src/views/bill/modules/SaleBackModal.vue
index a5dda730..74c8e52f 100644
--- a/jshERP-web/src/views/bill/modules/SaleBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/SaleBackModal.vue
@@ -97,6 +97,9 @@
             </a-form-item>
           </a-col>
           <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="销售人员">
+              <j-select-multiple placeholder="请选择销售人员" v-model="personList.value" :options="personList.options"/>
+            </a-form-item>
           </a-col>
         </a-row>
       </a-form>
@@ -109,13 +112,15 @@
   import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
   import { BillModalMixin } from '../mixins/BillModalMixin'
   import { getMpListShort } from "@/utils/util"
+  import JSelectMultiple from '@/components/jeecg/JSelectMultiple'
   import JDate from '@/components/jeecg/JDate'
   import Vue from 'vue'
   export default {
     name: "SaleBackModal",
     mixins: [JEditableTableMixin, BillModalMixin],
     components: {
-      JDate
+      JDate,
+      JSelectMultiple
     },
     data () {
       return {
@@ -186,6 +191,7 @@
       editAfter() {
         if (this.action === 'add') {
           this.addInit("XSTH")
+          this.personList.value = ''
         } else {
           this.model.operTime = this.model.operTimeStr
           this.model.debt = (this.model.discountLastMoney + this.model.otherMoney - this.model.changeAmount).toFixed(2)
@@ -197,9 +203,10 @@
           } else {
             this.manyAccountBtnStatus = false
           }
+          this.personList.value = this.model.salesMan
           this.$nextTick(() => {
             this.form.setFieldsValue(pick(this.model,'organId', 'operTime', 'number', 'remark',
-              'discount','discountMoney','discountLastMoney','otherMoney','accountId','changeAmount','debt'))
+              'discount','discountMoney','discountLastMoney','otherMoney','accountId','changeAmount','debt','salesMan'))
           });
           // 加载子表数据
           let params = {
@@ -225,6 +232,7 @@
         if(this.model.id){
           billMain.id = this.model.id
         }
+        billMain.salesMan = this.personList.value
         return {
           info: JSON.stringify(billMain),
           rows: JSON.stringify(detailArr),