Merge remote-tracking branch 'origin/master'

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

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
     },