src/api/purchase/goodsArrived.js

@@ -27,15 +27,6 @@ export function addPurchaseCheckInfo(data) {
   })
 }
 
-// 新购到货-编辑
-export function updatePurchaseCheckInfo(data) {
-  return request({
-      url: '/material/purchase_check_info',
-      method: 'put',
-      data: data,
-  })
-}
-
 //通知人员列表
 export function getNoticePeople(query) {
   return request({
@@ -53,6 +44,8 @@ export function delPeople(ids) {
   })
 }
 
+
+
 // 人员管理--新增
 export function addNoticeUser(data) {
   return request({

src/views/material/purchase/goodsArrived/component/addTools.vue

@@ -40,7 +40,7 @@
                 <el-date-picker
                     v-model="maForm.productionTime"
                     style="width: 240px"
-                    value-format="yyyy-MM-dd"
+                    value-format="yyyy-MM-dd hh:mm:ss"
                     :picker-options="pickerOptions"
                     type="date"
                     placeholder="请选择出厂日期"
@@ -200,8 +200,9 @@
                     <el-date-picker
                         v-model="scope.row.productionTime"
                         style="width: 100%"
-                        value-format="yyyy-MM-dd"
-                        type="date" 
+                        value-format="yyyy-MM-dd hh:mm:ss"
+                        type="date"
+                        range-separator="-"
                         placeholder="出厂日期"
                         clearable
                     ></el-date-picker>
@@ -629,7 +630,7 @@ export default {
                 this.maForm.remark = response.data.purchaseCheckInfo.remark
                 this.maForm.taxRate = response.data.purchaseCheckInfo.taxRate
                 // this.maForm.purchaseNumber = response.data.purchaseNumber
-                // this.maForm.productionTime = response.data.purchaseCheckInfo.productionTime
+                this.maForm.productionTime = response.data.purchaseCheckInfo.productionTime
                 this.equipmentList = response.data.purchaseCheckDetailsList
                 console.log(this.equipmentList)
                 // this.loading = false;
@@ -729,8 +730,11 @@ export default {
             if (this.equipmentList.length > 0) {
                 this.$refs['maForm'].validate((valid) => {
                     if (valid) {
+
                         this.maForm.taskId = this.taskId
-                        // this.maForm.checkDetailsList = this.equipmentList 
+                        this.maForm.checkDetailsList = this.equipmentList
+                        // console.log(this.maForm)
+                            if (this.equipmentList.length > 0) {
                                 this.$modal
                                     .confirm('是否确认保存当前页面')
                                     .then(function () {})
@@ -739,7 +743,7 @@ export default {
                                             console.log('编辑')
                                             this.loading = true
                                             updatePurchaseCheckInfo(
-                                                {purchaseCheckDetailsList: this.equipmentList,purchaseCheckInfo:this.maForm}
+                                                this.maForm,
                                             ).then((response) => {
                                                 if (response.code == 200) {
                                                     this.$modal.msgSuccess(
@@ -759,7 +763,7 @@ export default {
                                             console.log('新增')
                                             this.loading = true
                                             addPurchaseCheckInfo(
-                                               {purchaseCheckDetailsList: this.equipmentList,purchaseCheckInfo:this.maForm}
+                                               {purchaseCheckDetailsList: this.maForm.checkDetailsList,purchaseCheckInfo:this.maForm}
                                             ).then((response) => {
                                                 if (response.code == 200) {
                                                     this.$modal.msgSuccess(
@@ -778,12 +782,14 @@ export default {
                                         }
                                     })
                                     .catch(() => {})
-                             
+                            } else {
+                                this.$modal.msgError(
+                                    '请先选择并添加机具类型！！！',
+                                )
+                            }
                         
                     }
                 })
-            } else {
-                this.$modal.msgError('请先添加机具类型')
             }
         },