Browse Source

no message

linwenxin 4 months ago
parent
commit
4283bc1259

+ 63 - 54
src/views/mallManagement/purchaseScheduleManagement/purchaseSchedule/index.vue

@@ -84,11 +84,19 @@ export default {
       formDialogTitles: ['新增', '编辑', '详情', '审核'],
       formDialog: false,
       formData: {
+        fileUrl: [],
         companyWechatId: '',
         companyWechatName: '',
+        createBy: '',
+        createTime: '',
+        enginCode: '',
+        enginName: '',
         examineBy: '',
         examineTime: '',
-        fileUrl: '',
+        freightAmount: '',
+        id: '',
+        items: [],
+        orderGoodsType: '',
         remark: '',
         status: '',
         submitBy: '',
@@ -98,15 +106,7 @@ export default {
         updateBy: '',
         updateTime: '',
         venderId: '',
-        venderName: '',
-        storageId: '',
-        storageName: '',
-        enginCode: '',
-        enginName: '',
-        freightAmount: '',
-        orderGoodsType: '',
-        fileUrl: [],
-        items: []
+        venderName: ''
       },
       logs: []
     }
@@ -249,63 +249,72 @@ export default {
     },
     // 保存
     save() {
-      this.$refs.formRef.validateField(this.getVfyKey(this.isEditIndex), (valid, invalidFields, errLabels) => {
-        if (valid && this.eidtItems()) {
-          goodsPlanAdd({
-            ...this.formData,
-            items: this.formData.items.map((item, index) => ({ ...item, index: index + 1 })),
-            fileUrl: this.formData.fileUrl.map(item => item.url).join(',')
-          }).then(res => {
-            this.$message({
-              type: 'success',
-              message: '保存成功'
+      this.$refs.formRef.validateField(
+        ['venderId', 'orderGoodsType', 'enginCode', 'enginName', 'freightAmount', ...this.getVfyKey(this.isEditIndex)],
+        (valid, invalidFields, errLabels) => {
+          if (valid && this.eidtItems()) {
+            goodsPlanAdd({
+              ...this.formData,
+              items: this.formData.items.map((item, index) => ({ ...item, index: index + 1 })),
+              fileUrl: this.formData.fileUrl.map(item => item.url).join(',')
+            }).then(res => {
+              this.$message({
+                type: 'success',
+                message: '保存成功'
+              })
+              this.handleClose()
+              this.$refs.pageRef.refreshList()
             })
-            this.handleClose()
-            this.$refs.pageRef.refreshList()
-          })
+          }
         }
-      })
+      )
     },
     save2() {
-      this.$refs.formRef.validateField(this.getVfyKey(this.isEditIndex), (valid, invalidFields, errLabels) => {
-        if (valid && this.eidtItems()) {
-          goodsPlanUpdate({
-            ...this.formData,
-            items: this.formData.items.map((item, index) => ({ ...item, index: index + 1 })),
-            fileUrl: this.formData.fileUrl.map(item => item.url).join(',')
-          }).then(res => {
-            this.$message({
-              type: 'success',
-              message: '保存成功'
+      this.$refs.formRef.validateField(
+        ['venderId', 'orderGoodsType', 'enginCode', 'enginName', 'freightAmount', ...this.getVfyKey(this.isEditIndex)],
+        (valid, invalidFields, errLabels) => {
+          if (valid && this.eidtItems()) {
+            goodsPlanUpdate({
+              ...this.formData,
+              items: this.formData.items.map((item, index) => ({ ...item, index: index + 1 })),
+              fileUrl: this.formData.fileUrl.map(item => item.url).join(',')
+            }).then(res => {
+              this.$message({
+                type: 'success',
+                message: '保存成功'
+              })
+              this.handleClose()
+              this.$refs.pageRef.refreshList()
             })
-            this.handleClose()
-            this.$refs.pageRef.refreshList()
-          })
+          }
         }
-      })
+      )
     },
     // 提交
     submit() {
-      this.$refs.formRef.validateField(this.getVfyKey(this.isEditIndex), (valid, invalidFields, errLabels) => {
-        if (valid && this.eidtItems()) {
-          goodsPlanUpdate({
-            ...this.formData,
-            items: this.formData.items.map((item, index) => ({ ...item, index: index + 1 })),
-            fileUrl: this.formData.fileUrl.map(item => item.url).join(',')
-          }).then(res => {
-            goodsPlanSubmit({
-              id: this.formData.id
+      this.$refs.formRef.validateField(
+        ['venderId', 'orderGoodsType', 'enginCode', 'enginName', 'freightAmount', ...this.getVfyKey(this.isEditIndex)],
+        (valid, invalidFields, errLabels) => {
+          if (valid && this.eidtItems()) {
+            goodsPlanUpdate({
+              ...this.formData,
+              items: this.formData.items.map((item, index) => ({ ...item, index: index + 1 })),
+              fileUrl: this.formData.fileUrl.map(item => item.url).join(',')
             }).then(res => {
-              this.$message({
-                type: 'success',
-                message: '提交成功'
+              goodsPlanSubmit({
+                id: this.formData.id
+              }).then(res => {
+                this.$message({
+                  type: 'success',
+                  message: '提交成功'
+                })
+                this.handleClose()
+                this.$refs.pageRef.refreshList()
               })
-              this.handleClose()
-              this.$refs.pageRef.refreshList()
             })
-          })
+          }
         }
-      })
+      )
     },
     // 审核
     examine(type) {

+ 20 - 13
src/views/mallManagement/purchaseScheduleManagement/purchaseSchedule/mixins/common_form.js

@@ -96,7 +96,7 @@ export default {
                         rules={[
                           diyRequired.bind(this)((rule, value) => {
                             if (this.logs) {
-                              this.logs.push({ errMsg: `*orderGoodsType不能为空` })
+                              this.logs.push({ errMsg: `*订货类型不能为空` })
                             }
                             this?.tishicuowu?.()
                             return new Error('必须填写')
@@ -119,7 +119,7 @@ export default {
                       </el-form-item>
                     </div>
                   </el-descriptions-item>
-                  <el-descriptions-item label="工程登入编号">
+                  <el-descriptions-item label={`${this.formData.orderGoodsType === 'E' ? '*' : ''}工程登入编号`}>
                     <div class="redbordererr">
                       <el-form-item
                         label=""
@@ -160,7 +160,10 @@ export default {
                   contentStyle={{ width: '17%' }}
                   style="margin-top:-1px"
                 >
-                  <el-descriptions-item label="工程名称" contentStyle={{ width: '42%' }}>
+                  <el-descriptions-item
+                    label={`${this.formData.orderGoodsType === 'E' ? '*' : ''}工程名称`}
+                    contentStyle={{ width: '42%' }}
+                  >
                     <div class="redbordererr">
                       <el-form-item
                         label=""
@@ -191,21 +194,25 @@ export default {
                       </el-form-item>
                     </div>
                   </el-descriptions-item>
-                  <el-descriptions-item label="运费(元)">
+                  <el-descriptions-item label={`${this.formData.orderGoodsType === 'E' ? '*' : ''}运费(元)`}>
                     <div class="redbordererr">
                       <el-form-item
                         label=""
                         lebel-width="0px"
                         prop={`freightAmount`}
-                        rules={[
-                          diyRequired.bind(this)((rule, value) => {
-                            if (this.logs) {
-                              this.logs.push({ errMsg: `*运费不能为空` })
-                            }
-                            this?.tishicuowu?.()
-                            return new Error('必须填写')
-                          })
-                        ]}
+                        rules={
+                          this.formData.orderGoodsType === 'E'
+                            ? [
+                                diyRequired.bind(this)((rule, value) => {
+                                  if (this.logs) {
+                                    this.logs.push({ errMsg: `*运费不能为空` })
+                                  }
+                                  this?.tishicuowu?.()
+                                  return new Error('必须填写')
+                                })
+                              ]
+                            : []
+                        }
                       >
                         <el-input
                           type="number"

+ 2 - 1
src/views/mallManagement/purchaseScheduleManagement/purchaseSchedule/mixins/storage_goods.js

@@ -9,7 +9,8 @@ export default {
     return {
       brandList: [],
       ClassifyList: [],
-      goodsMaterialList: []
+      goodsMaterialList: [],
+      isEditIndex: -1
     }
   },
   computed: {