From be53cbd8c9c3b7680a3e9a7d77997f310a49901c Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Tue, 31 Jan 2023 18:02:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=85=A5=E5=BA=93--=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E6=9C=BA=E6=9E=84=E5=8A=9F=E8=83=BD=E3=80=81=E5=88=86?=
 =?UTF-8?q?=E6=89=B9=E5=85=A5=E5=BA=93=E6=97=B6=E8=BD=A6=E8=BE=86=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E4=B8=8D=E8=83=BD=E4=B8=BA=E7=A9=BA=E3=80=81=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E5=AE=A1=E6=89=B9=E5=90=8C=E6=84=8F=E6=97=B6=E4=B8=8D?=
 =?UTF-8?q?=E8=83=BD=E9=87=8D=E5=A4=8D=E7=82=B9=E5=87=BB=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruzhang/ruzhangguanli/ruzhangAdd.vue      | 24 ++++++++++++++++---
 .../ruzhang/ruzhangguanli/ruzhangguanli.vue   |  4 ++--
 .../ruzhangguanli/ruzhangDaiBanInfo.vue       | 10 ++++++--
 .../ruzhangguanli/ruzhangEdit.vue             | 17 ++++++++++++-
 4 files changed, 47 insertions(+), 8 deletions(-)

diff --git a/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue b/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue
index cbd45e3e62..1979896248 100644
--- a/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue
@@ -217,7 +217,7 @@
 <script>
 import req from '@/api/ruzhang/scmapplyinbound'
 import upload_picture from '@/components/uploadFile/upload_picture'
-import { getPathSidByUserSid, fetchBySid } from '@/api/cheliang/dictcommons'
+import { getOrgSidByPath, fetchBySid } from '@/api/cheliang/dictcommons'
 export default {
   name: 'RuzhangAdd',
   components: {
@@ -280,7 +280,8 @@ export default {
         deductionPolicyFourThree: '', // 计算政策4: 扣减政策3
         scmFiles: [],
         vehicleList: [],
-        vehicleOrderSid: ''
+        vehicleOrderSid: '',
+        orgPath: ''
       },
       rules: {},
       submitdisabled: false
@@ -288,7 +289,7 @@ export default {
   },
   methods: {
     init() {
-      getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((resp) => {
+      getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => {
         if (resp.success) {
           this.formobj.useOrgSid = resp.data
           fetchBySid(this.formobj.useOrgSid).then((res) => {
@@ -632,6 +633,7 @@ export default {
         const data = resp.data
         this.formobj = data
         this.formobj.userSid = window.sessionStorage.getItem('userSid')
+        this.formobj.orgPath = window.sessionStorage.getItem('defaultOrgPath')
         if (this.formobj.scmFiles.length > 0) {
           this.formobj.scmFiles.forEach((e) => {
             this.imgList.push({
@@ -817,6 +819,21 @@ export default {
       } else {
         this.formobj.deductionPolicyFourThree = 1
       }
+      // 判断车辆列表不能为空
+      var hint1 = 0
+      if (this.formobj.vehicleList.length > 0) {
+        for (var i = 0; i < this.formobj.vehicleList.length; i++) {
+          if (this.formobj.vehicleList[i].vinNo !== '') {
+            hint1 = 1
+            break
+          }
+        }
+      }
+      if (hint1 === 0) {
+        this.$message({ showClose: true, type: 'error', message: '车辆列表不能为空' })
+        return
+      }
+      // 判断车辆列表中是否有未填写的车架号记录，如果有则进行分批入库的功能
       var hint = 0
       if (this.formobj.vehicleList.length > 0) {
         for (var i = 0; i < this.formobj.vehicleList.length; i++) {
@@ -854,6 +871,7 @@ export default {
           })
         }).catch(() => {
           hint = 0
+          hint1 = 0
         })
       } else {
         this.$refs['form_obj'].validate(valid => {
diff --git a/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangguanli.vue b/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangguanli.vue
index c7f29c5030..10add3e04a 100644
--- a/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangguanli.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangguanli.vue
@@ -91,7 +91,7 @@ import req from '@/api/ruzhang/scmapplyinbound'
 import ButtonBar from '@/components/ButtonBar'
 import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
-import { getPathSidByUserSid } from '@/api/cheliang/dictcommons'
+import { getOrgSidByPath } from '@/api/cheliang/dictcommons'
 import divAdd from './ruzhangAdd'
 import divInfo from './ruzhangInfo'
 import cheliangpaichanInfo from '../../../views/supplychain/cheliangpaichan/cheliangpaichanInfo'
@@ -196,7 +196,7 @@ export default {
       }
     },
     init() {
-      getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((resp) => {
+      getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => {
         if (resp.success) {
           this.queryParams.params.createOrgSid = resp.data
           this.loadList()
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangDaiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangDaiBanInfo.vue
index 73bd582ccc..766ff1df4a 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangDaiBanInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangDaiBanInfo.vue
@@ -235,8 +235,8 @@
           </el-col>
         </el-row>
         <div style="text-align:center;margin-top: 20px;">
-          <el-button type="primary" size="mini" @click="reject">确 定</el-button>
-          <el-button type="info " size="mini" @click="nodeDialogVisible = false">取 消</el-button>
+          <el-button type="primary" :disabled="submitdisabled" size="mini" @click="reject">确定</el-button>
+          <el-button type="info " :disabled="submitdisabled" size="mini" @click="nodeDialogVisible = false">取消</el-button>
         </div>
       </el-form>
     </el-dialog>
@@ -463,6 +463,7 @@ export default {
     /** 同意任务 */
     handleAgree() {
       this.linkByParameter.comment = this.dialogList.comment
+      this.submitdisabled = true
       req.complete(this.linkByParameter).then((response) => {
         if (response.success) {
           this.$notify({
@@ -471,6 +472,7 @@ export default {
             type: 'success',
             duration: 2000
           })
+          this.submitdisabled = false
           this.nodeDialogVisible = false
           // 子页面向父级页面传递值
           window.parent.postMessage({
@@ -480,7 +482,11 @@ export default {
               code: 1
             }
           }, '*')
+        } else {
+          this.submitdisabled = false
         }
+      }).catch(() => {
+        this.submitdisabled = false
       })
     },
     /** 驳回任务 */
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue
index 1e25a7e4c7..da49d4c410 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue
@@ -277,7 +277,8 @@ export default {
         deductionPolicyTwoOne: '',
         scmFiles: [],
         vehicleList: [],
-        vehicleOrderSid: ''
+        vehicleOrderSid: '',
+        orgPath: ''
       },
       rules: {},
       submitdisabled: false
@@ -837,6 +838,19 @@ export default {
       } else {
         this.formobj.deductionPolicyFourThree = 1
       }
+      var hint1 = 0
+      if (this.formobj.vehicleList.length > 0) {
+        for (var i = 0; i < this.formobj.vehicleList.length; i++) {
+          if (this.formobj.vehicleList[i].vinNo !== '') {
+            hint1 = 1
+            break
+          }
+        }
+      }
+      if (hint1 === 0) {
+        this.$message({ showClose: true, type: 'error', message: '车辆列表不能为空' })
+        return
+      }
       var hint = 0
       if (this.formobj.vehicleList.length > 0) {
         for (var i = 0; i < this.formobj.vehicleList.length; i++) {
@@ -881,6 +895,7 @@ export default {
           })
         }).catch(() => {
           hint = 0
+          hint1 = 0
         })
       } else {
         this.$refs['form_obj'].validate(valid => {