whj 1 年之前
父节点
当前提交
c54611296a
共有 2 个文件被更改,包括 20 次插入2 次删除
  1. 4 1
      src/views/idle-assets/modules/Detail.vue
  2. 16 1
      src/views/purchase/purchase-order-page/modules/BaseForm.vue

+ 4 - 1
src/views/idle-assets/modules/Detail.vue

@@ -8,9 +8,12 @@
     <detail-list title="" :col="2">
       <detail-list-item term="闲置名称">{{ modal.name }}</detail-list-item>
       <detail-list-item term="闲置单号">{{ modal.no }}</detail-list-item>
+      <detail-list-item term="申请人">{{ modal.applyName }}</detail-list-item>
+      <detail-list-item term="申请原因">{{ modal.advice }}</detail-list-item>
       <detail-list-item term="申请时间">{{ modal.createdTime }}</detail-list-item>
       <detail-list-item term="状态">{{ BaseTool.Object.getField(statusMap,modal.status) }}</detail-list-item>
-      <detail-list-item term="审核人">{{ modal.verifyUserName }}</detail-list-item>
+      <detail-list-item term="审核主管">{{ modal.verifyUserName }}</detail-list-item>
+      <detail-list-item term="部门负责人">{{ modal.verifyUserName2 }}</detail-list-item>
     </detail-list>
     <title-divider title="设备集合" width="90px"></title-divider>
     <a-table

+ 16 - 1
src/views/purchase/purchase-order-page/modules/BaseForm.vue

@@ -377,6 +377,7 @@ export default {
           'oldOrNew',
           'projectId',
           'positionNo',
+          'cbmemo',
           'cptcode',
           'remark',
           'cdepcode',
@@ -424,9 +425,23 @@ export default {
           this.confirmLoading = false
           return
         }
+        let status = 0
         values.needDate = values.needDate ? this.BaseTool.Date.formatter(values.needDate, this.BaseTool.Date.PICKER_NORM_DATE_PATTERN) : null
         values.planGetDate = values.planGetDate ? this.BaseTool.Date.formatter(values.planGetDate, this.BaseTool.Date.PICKER_NORM_DATE_PATTERN) : null
-        values.detailDTOS = this.data
+        values.detailDTOS = this.data.map(item => {
+          if (!item.ftaxprice) {
+            status++
+            this.$message.error('请填写' + item.spareName + '单价')
+          }
+          if (!item.cdefine12) {
+            status++
+            this.$message.error('请填写' + item.spareName + '物料简述')
+          }
+          return item
+        })
+        if (status !== 0) {
+          return
+        }
         if (values.id) {
           updatePurchaseOrder2(values).then(res => {
             this.$message.success('修改成功!')