Преглед на файлове

修改删除接口 修改生产订单保存校验的问题

Qukatie преди 11 месеца
родител
ревизия
c34f5d2a2c

+ 1 - 1
src/api/tirePartsMall/productionManagement/productionPicking/index.js

@@ -23,7 +23,7 @@ export const remove = (data) => {
 //删除*
 export const itemsRemove = (data) => {
   return request({
-    url: '/api/blade-sales-part/shipItems/removee',
+    url: '/api/blade-sales-part/shipItems/remove',
     method: 'get',
     params: data
   })

+ 4 - 4
src/api/tirePartsMall/purchaseService/outboundTask.js

@@ -8,12 +8,12 @@ export const getList = (params) => {
   })
 }
 //删除
-export const remove = (id) => {
+export const remove = (ids) => {
   return request({
-    url: '/api/blade-sales-part/ship/update',
+    url: '/api/blade-sales-part/ship/remove',
     method: 'post',
-    data: {
-      id
+    params: {
+      ids
     }
   })
 }

+ 4 - 4
src/api/tirePartsMall/purchasingManagement/warehouseEntryOrder.js

@@ -8,12 +8,12 @@ export const getList = (params) => {
   })
 }
 //删除
-export const remove = (id) => {
+export const remove = (ids) => {
   return request({
-    url: '/api/blade-sales-part/ship/update',
+    url: '/api/blade-sales-part/ship/remove',
     method: 'post',
-    data: {
-      id
+    params: {
+      ids
     }
   })
 }

+ 4 - 4
src/api/tirePartsMall/salesManagement/outboundTask.js

@@ -8,12 +8,12 @@ export const getList = (params) => {
   })
 }
 //删除
-export const remove = (id) => {
+export const remove = (ids) => {
   return request({
-    url: '/api/blade-sales-part/ship/update',
+    url: '/api/blade-sales-part/ship/remove',
     method: 'post',
-    data: {
-      id
+    params: {
+      ids
     }
   })
 }

+ 9 - 9
src/api/tirePartsMall/salesManagement/outboundWorkOrder.js

@@ -8,21 +8,21 @@ export const getList = (params) => {
   })
 }
 //删除
-export const remove = (id) => {
+export const remove = (ids) => {
   return request({
-    url: '/api/blade-sales-part/ship/update',
+    url: '/api/blade-sales-part/ship/remove',
     method: 'post',
-    data: {
-      id
+    params: {
+      ids
     }
   })
 }
-export const tradingBox = (id) => {
+export const tradingBox = (ids) => {
   return request({
-    url: '/api/blade-sales-part/shipItems/update',
-    method: 'post',
-    data: {
-      id
+    url: '/api/blade-sales-part/shipItems/remove',
+    method: 'get',
+    params: {
+      ids
     }
   })
 }

+ 2 - 2
src/api/tirePartsMall/salesManagement/saleOrder.js

@@ -19,9 +19,9 @@ export const statisticsDetails = (params) => {
 //删除
 export const remove = (data) => {
   return request({
-    url: '/api/blade-sales-part/order/update',
+    url: '/api/blade-sales-part/order/remove',
     method: 'post',
-    data
+    params: data
   })
 }
 export const getDetails = (data) => {

+ 4 - 4
src/api/tirePartsMall/salesService/outboundTask.js

@@ -8,12 +8,12 @@ export const getList = (params) => {
   })
 }
 //删除
-export const remove = (id) => {
+export const remove = (ids) => {
   return request({
-    url: '/api/blade-sales-part/ship/update',
+    url: '/api/blade-sales-part/ship/remove',
     method: 'post',
-    data: {
-      id
+    params: {
+      ids
     }
   })
 }

+ 8 - 10
src/views/tirePartsMall/basicData/customerInformation/components/limitrecord.vue

@@ -17,16 +17,16 @@
           @refresh-change="refreshChange" @on-load="onLoad"
           @resetColumn="resetColumnTwo('crud', 'option', 'optionList', 340)"
           @saveColumn="saveColumnTwo('crud', 'option', 'optionList', 340)">
-          <template slot="menuLeft">
+          <!-- <template slot="menuLeft">
             <el-button type="danger" size="small" icon="el-icon-delete" plain @click="handleDelete">删 除
             </el-button>
-          </template>
+          </template> -->
         </avue-crud>
       </el-tab-pane>
       <el-tab-pane label="消费记录" name="XFJL">
-        <avue-crud :option="option2" :table-loading="loading2" :data="data2" v-model="form" ref="crud"
-          @resetColumn="resetColumnTwo('crud', 'option2', 'optionList2', 436)"
-          @saveColumn="saveColumnTwo('crud', 'option2', 'optionList2', 436)">
+        <avue-crud :option="option2" :table-loading="loading2" :data="data2" v-model="form" ref="crud2"
+          @resetColumn="resetColumnTwo('crud2', 'option2', 'optionList2', 436)"
+          @saveColumn="saveColumnTwo('crud2', 'option2', 'optionList2', 436)">
           <template slot="ordNo" slot-scope="{ row }">
             <span style="color: #1e9fff;cursor: pointer;" @click="rowEdit(row)">{{ row.ordNo }}</span>
           </template>
@@ -105,14 +105,12 @@ export default {
         height: '300',
         calcHeight: 30,
         tip: false,
-        searchShow: true,
-        searchMenuSpan: 6,
         border: true,
         index: true,
-        viewBtn: true,
-        selection: true,
-        dialogClickModal: false,
         menu: false,
+        addBtn: false,
+        refreshBtn: false,
+        align: 'center',
         column: [
           {
             label: "原额度",

+ 8 - 6
src/views/tirePartsMall/productionManagement/productionOrder/detailsPage.vue

@@ -526,6 +526,8 @@ export default {
                 if (row) {
                     this.form.goodsId = row.goodsId
                     this.form.goodsName = row.goodsName
+                    this.form.attributeItemsList=[]
+                    this.form.craftItemsList=[]
                     getGoodsDetail({ id: row.id }).then(res => {
                         res.data.data.attributeItemsList.forEach(item => {
                             delete item.id
@@ -777,12 +779,12 @@ export default {
             this.$refs["form"].validate((valid, done) => {
                 done();
                 if (valid) {
-                    for (let row of this.form.craftItemsList) {
-                        if (!row.productionProcesses || !row.assemblyMileageProgress || !row.actualTime || !row.actualTime) {
-                            this.$refs.crud.rowCell(row, row.$index)
-                            return this.$message.error("请完善明细信息");
-                        }
-                    }
+                    // for (let row of this.form.craftItemsList) {
+                    //     if (!row.productionProcesses || !row.assemblyMileageProgress) {
+                    //         // this.$refs.crud.rowCell(row, row.$index)
+                    //         return this.$message.error("请完善明细信息");
+                    //     }
+                    // }
                     let obj = {}
                     obj = {
                         ...this.form,

+ 2 - 0
src/views/tirePartsMall/productionManagement/productionPicking/detailsPage.vue

@@ -560,6 +560,8 @@ export default {
         dialogTop: 25,
         dialogWidth: "80%",
         showSummary: true,
+        tip:false,
+        selection: true,
         saveBtn: false, // 表格弹窗保存按钮
         cellBtn: false, // 行编辑
         sumColumnList: [

+ 1 - 1
src/views/tirePartsMall/salesManagement/purchaseOrder/index.vue

@@ -611,7 +611,7 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        remove({ id: form.id }).then(res => {
+        remove({ ids: form.id }).then(res => {
           this.$message({
             type: 'success',
             message: '删除成功!'

+ 1 - 1
src/views/tirePartsMall/salesManagement/saleOrder/index.vue

@@ -654,7 +654,7 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        remove({ id: form.id }).then(res => {
+        remove({ ids: form.id }).then(res => {
           this.$message({
             type: 'success',
             message: '删除成功!'