From 1947805fe3306c06005d772f4573040fc889ba97 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Thu, 28 Jul 2022 19:08:11 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=9B=98=E5=BA=93=E3=80=81?=
 =?UTF-8?q?=E5=B7=A1=E6=A3=80=E4=B8=8B=E6=8B=89=E6=A1=86=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E4=BA=BA=E5=91=98=E6=97=B6=E5=86=85=E5=AE=B9=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=8A=A0=E4=B8=8A=E9=83=A8=E9=97=A8=E3=80=81=E5=B2=97=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cheliangweihu/richangxunjian/xunjiandan.vue    | 14 ++++++++++----
 .../src/views/kucunguanli/panku/pankuAdd.vue       |  5 +++--
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/cheliangweihu/richangxunjian/xunjiandan.vue b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/cheliangweihu/richangxunjian/xunjiandan.vue
index c5540e8acd..3ce1fc4437 100644
--- a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/cheliangweihu/richangxunjian/xunjiandan.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/cheliangweihu/richangxunjian/xunjiandan.vue
@@ -47,7 +47,7 @@
               <div class="span-sty spanOneWidth"><span>相关责任人</span></div>
               <el-form-item>
                 <el-select v-model="formobj.dutyName" placeholder="请选择" filterable @change="changeInventoryName" clearable class="addinputwOne">
-                  <el-option v-for="item in staff_list" :key="item.sid" :label="item.name" :value="item.name"></el-option>
+                  <el-option v-for="item in staff_list" :key="item.sid" :label="item.namePath" :value="item.sid"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -143,7 +143,7 @@ export default {
     changeInventoryName(value) {
       let bb = null
       this.staff_list.forEach((e) => {
-        if (e.name === value) {
+        if (e.sid === value) {
           bb = {
             name: e.name,
             sid: e.sid
@@ -163,7 +163,10 @@ export default {
       this.formobj.images = aa
     },
     handleSave() {
-      console.log(this.formobj)
+      if (this.formobj.situationExplain === '') {
+        this.$message({ showClose: true, type: 'error', message: '请填写巡检情况说明' })
+        return
+      }
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
           this.submitdisabled = true
@@ -186,7 +189,10 @@ export default {
       })
     },
     handlePass() {
-      console.log(this.formobj)
+      if (this.formobj.situationExplain === '') {
+        this.$message({ showClose: true, type: 'error', message: '请填写巡检情况说明' })
+        return
+      }
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
           this.submitdisabled = true
diff --git a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/panku/pankuAdd.vue b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/panku/pankuAdd.vue
index 50f506aa37..f2195873d1 100644
--- a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/panku/pankuAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/panku/pankuAdd.vue
@@ -28,7 +28,7 @@
               <div class="span-sty spanOneWidth"><span>盘库人员:</span></div>
               <el-form-item>
                 <el-select v-model="listQuery.params.inventoryName" placeholder="请选择" filterable @change="changeInventoryName" clearable class="addinputwOne">
-                  <el-option v-for="item in staff_list" :key="item.sid" :label="item.name" :value="item.name"></el-option>
+                  <el-option v-for="item in staff_list" :key="item.sid" :label="item.namePath" :value="item.sid"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -236,13 +236,14 @@ export default {
     changeInventoryName(value) {
       let bb = null
       this.staff_list.forEach((e) => {
-        if (e.name === value) {
+        if (e.sid === value) {
           bb = {
             name: e.name,
             sid: e.sid
           }
         }
       })
+      this.listQuery.params.inventoryName = bb.name
       this.formobj.inventoryName = bb.name
       this.formobj.inventorySid = bb.sid
     },