feat:新修改供应商问题

zkqy-custom-business/src/main/resources/mapper/business/PurchaseInfoMapper.xml

@@ -115,6 +115,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="taskProcessKey != null">task_process_key,</if>
             <if test="taskNodeKey != null">task_node_key,</if>
             <if test="lotNumber != null">lot_number,</if>
+
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="purchaseId != null">#{purchaseId},</if>

zkqy-custom-business/src/main/resources/mapper/business/PurchaseMapper.xml

@@ -119,6 +119,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="taskNodeKey != null">task_node_key,</if>
             <if test="processKey != null">process_key,</if>
             <if test="lotNumber != null">lot_number,</if>
+            <if test="procurementTime != null">procurement_time,</if>
+            <if test="estimatedDeliveryTime != null">estimated_delivery_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="serialNumber != null">#{serialNumber},</if>
@@ -152,6 +154,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="taskNodeKey != null">#{taskNodeKey},</if>
             <if test="processKey != null">#{processKey},</if>
             <if test="lotNumber != null">#{lotNumber},</if>
+            <if test="procurementTime != null"> #{procurementTime},</if>
+            <if test="estimatedDeliveryTime != null">#{estimatedDeliveryTime},</if>
          </trim>
     </insert>
 
@@ -189,6 +193,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="taskNodeKey != null">task_node_key = #{taskNodeKey},</if>
             <if test="processKey != null">process_key = #{processKey},</if>
             <if test="lotNumber != null">lot_number = #{lotNumber},</if>
+            <if test="procurementTime != null">procurement_time = #{procurementTime},</if>
+            <if test="estimatedDeliveryTime != null">estimated_delivery_time = #{estimatedDeliveryTime},</if>
         </trim>
         where id = #{id}
     </update>

zkqy-ui/src/api/datasheet/index.js

@@ -5,7 +5,7 @@ export function createDatabase(data) {
       url: '/tableInfo/createTable',
       method: 'post',
       data: data,
-      baseURL:process.env.VUE_APP_BASE_API1
+      // baseURL:process.env.VUE_APP_BASE_API1
     })
   }
 
@@ -14,7 +14,7 @@ export function createDatabase(data) {
       url: '/tableInfo/createSqlServerDataBase',
       method: 'post',
       data: data,
-      baseURL:process.env.VUE_APP_BASE_API1
+      // baseURL:process.env.VUE_APP_BASE_API1
     })
   }
 
@@ -23,6 +23,6 @@ export function createDatabase(data) {
       url: '/tableInfo/createDmDataBase',
       method: 'post',
       data: data,
-      baseURL:process.env.VUE_APP_BASE_API1
+      // baseURL:process.env.VUE_APP_BASE_API1
     })
   }

zkqy-ui/src/api/plan/paln.js

@@ -43,7 +43,7 @@ export function addMaterielInfo(data) {
     url: '/business/ammunitionPlanInfo',
     method: 'POST',
     data: data,
-    //baseURL: process.env.VUE_APP_BASE_API1
+    ////baseURL: process.env.VUE_APP_BASE_API1
   })
 }
 
@@ -52,7 +52,7 @@ export function getSalesman(data) {
   return request({
     url: '/system/order/salesman/getSalesman',
     method: 'GET',
-    //baseURL: process.env.VUE_APP_BASE_API1
+    ////baseURL: process.env.VUE_APP_BASE_API1
   })
 }
 
@@ -63,7 +63,7 @@ export function getAllPlanListByMachineId(machineId) {
     params: {
       machineId: machineId
     },
-    //baseURL: process.env.VUE_APP_BASE_API1
+    ////baseURL: process.env.VUE_APP_BASE_API1
   })
 }
 
@@ -72,7 +72,7 @@ export function getAllPlanListByProductTypeAndStatus(data) {
     url: '/business/ammunitionPlanInfo/getAllPlanListByProductTypeAndStatus',
     params: data,
     method: 'GET',
-    //baseURL: process.env.VUE_APP_BASE_API1
+    ////baseURL: process.env.VUE_APP_BASE_API1
   })
 }
 
@@ -81,7 +81,7 @@ export function updatePlanOne(data) {
     url: '/system/plan',
     params: data,
     method: 'PUT',
-    //baseURL: process.env.VUE_APP_BASE_API1
+    ////baseURL: process.env.VUE_APP_BASE_API1
   })
 }
 
@@ -95,7 +95,7 @@ export function getSpinningPlanList(data) {
     url: '/system/spinning/list',
     method: 'GET',
     params: data,
-    //baseURL: process.env.VUE_APP_BASE_API1
+    ////baseURL: process.env.VUE_APP_BASE_API1
   })
 }
 
@@ -108,7 +108,7 @@ export function addSpinningPlanList(data) {
     url: '/system/spinning',
     method: 'POST',
     data: data,
-    //baseURL: process.env.VUE_APP_BASE_API1
+    ////baseURL: process.env.VUE_APP_BASE_API1
   })
 }
 
@@ -121,7 +121,7 @@ export function getPlanSpinningInfo(data) {
     url: '/system/spinning/list/getPlanSpinningInfo',
     method: 'get',
     params: data,
-    //baseURL: process.env.VUE_APP_BASE_API1
+    ////baseURL: process.env.VUE_APP_BASE_API1
   })
 }
 
@@ -136,7 +136,7 @@ export function getCurrentProductionLineSuperior(data) {
     url: '/system/spinning/list/getCurrentProductionLineSuperior',
     method: 'get',
     params: data,
-    //baseURL: process.env.VUE_APP_BASE_API1
+    ////baseURL: process.env.VUE_APP_BASE_API1
   })
 }
 
@@ -186,7 +186,7 @@ export function updateSpinningInfoPlanOne(data) {
     url: '/system/spinning/update/updateSpinningInfoPlanOne',
     data: data,
     method: 'PUT',
-    //baseURL: process.env.VUE_APP_BASE_API1
+    ////baseURL: process.env.VUE_APP_BASE_API1
   })
 }
 
@@ -199,7 +199,7 @@ export function removeBombLoadingPlan(id) {
   return request({
     url: '/system/plan/remove/'+id,
     method: 'Delete',
-    baseURL: process.env.VUE_APP_BASE_API1
+    //baseURL: process.env.VUE_APP_BASE_API1
   })
 }
 
@@ -210,7 +210,7 @@ export function spinningFrameWinding(id) {
   return request({
     url: '/system/spinning/remove/'+id,
     method: 'Delete',
-    baseURL: process.env.VUE_APP_BASE_API1
+    //baseURL: process.env.VUE_APP_BASE_API1
   })
 }
 
@@ -222,7 +222,7 @@ export function whetherTheFeederIsShutDown(id) {
   return request({
     url: '/system/plan/listStatus/'+id,
     method: 'get',
-    baseURL: process.env.VUE_APP_BASE_API1
+    //baseURL: process.env.VUE_APP_BASE_API1
   })
 }
 
@@ -233,6 +233,6 @@ export function updateLineStates(id,mids) {
   return request({
     url: '/system/plan/updateLineStates/'+id+'/'+mids,
     method: 'POST',
-    baseURL: process.env.VUE_APP_BASE_API1
+    //baseURL: process.env.VUE_APP_BASE_API1
   })
 }

zkqy-ui/src/api/supplier/supplier.js

@@ -4,9 +4,10 @@ import request from "@/utils/request";
  * 查询供应商信息
  * @returns {*}
  */
-export function getListSupplier() {
+export function getListSupplier(data) {
   return request({
     url: '/business/supplier/getList',
+    params: data,
     method: 'get',
   })
 }

zkqy-ui/src/views/orderMange/purchase/listInfoTwo.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="app-container">
+<!--    ddddd-->
     <!-- 上传表单-->
     <el-dialog
       :title="upload.title"
@@ -862,8 +863,7 @@ export default {
     },
     //供应商信息
     getListSupplier() {
-      getListSupplier().then((res) => {
-
+      getListSupplier({isEnablePaging:false}).then((res) => {
         this.suppliers = res.data;
       });
     },