vue2-client 1.2.93-test → 1.2.94

package/src/base-client/components/common/PersonSetting/PersonSetting.vue

@@ -8,9 +8,9 @@
     <a-modal
       v-if="visible"
       v-model="visible"
-      title="流程步骤负责人设置"
+      :title="placeholder"
       :z-index="1031"
-      :bodyStyle="{ maxHeight: '65vh', overflowY: 'auto' }"
+      :bodyStyle="{ maxHeight: '68vh', overflowY: 'auto' }"
       @ok="handleOk"
       @close="visible=false"
     >
@@ -49,7 +49,7 @@
 </template>
 
 <script>
-import { commonApi, post } from '@/services/api'
+import { commonApi, post } from '@vue2-client/services/api'
 
 const departments = ['运维部', '项目部', '项目一部', '项目二部', '开发部', '售后部', '办公室', '管理员', '软件工程部', 'IC卡部', '销售部']
 

package/src/base-client/components/common/XFormTable/XFormTable.vue

@@ -269,16 +269,16 @@ export default {
     },
     // TODO 新增/修改数据表单提交
     onAddOrModify (res) {
-      // if (this.viewMode) {
-      //   this.$message.info('预览模式禁止新增')
-      //   return false
-      // }
+      if (this.viewMode) {
+        this.$message.info('预览模式禁止新增')
+        return false
+      }
       // 如果是临时表
       if (this.isTableTemp) {
         this.$emit('tempTableModify', res)
         return
       }
-      // if (true) {
+      if (res.valid) {
         this.loading = true
         const requestParameters = {
           queryParamsName: this.queryParamsName,
@@ -294,7 +294,6 @@ export default {
           const realKey = key.substring(key.indexOf('_') + 1)
           requestParameters.form[realKey] = res.form[key]
         }
-      console.log(this.customAoM, '====1')
       if (!this.customAoM || this.customAoM?.length === 0) {
           this.customAoM = undefined
         }
@@ -310,9 +309,9 @@ export default {
           this.modelVisible = false
           this.$message.error(this.businessType + '失败！')
         })
-      // } else {
-      //   return false
-      // }
+      } else {
+        return false
+      }
     },
     // 刷新加载表格数据
     loadData (requestParameters, callback) {