diff --git a/src/api/basic/busLocalType.js b/src/api/basic/busLocalType.js
index f593f6ca..f35d2218 100644
--- a/src/api/basic/busLocalType.js
+++ b/src/api/basic/busLocalType.js
@@ -1,75 +1,68 @@
 import axios from "@/utils/request";
 
 export function getLocalBusType(query) {
-    return axios({
-        url: "/udiwms/localBusType/filter",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/udiwms/localBusType/filter",
+    method: "get",
+    params: query
+  });
 }
 
 export function getLocalJoinBusType(query) {
-    return axios({
-        url: "/udiwms/localBusType/filterJoin",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/udiwms/localBusType/filterJoin",
+    method: "get",
+    params: query
+  });
 }
 
-export function getLocalJoinByUser(query) {
-    return axios({
-        url: "/udiwms/localBusType/filterJoinByUser",
-        method: "get",
-        params: query
-    });
-}
 
 export function getLocalJoinNoUse(query) {
-    return axios({
-        url: "/udiwms/localBusType/filterUnUse",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/udiwms/localBusType/filterUnUse",
+    method: "get",
+    params: query
+  });
 }
 
 export function filterByBus(query) {
-    return axios({
-        url: "/udiwms/localBusType/filterByBus",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/udiwms/localBusType/filterByBus",
+    method: "get",
+    params: query
+  });
 }
 
 
 export function addLocalBusType(query) {
-    return axios({
-        url: "/udiwms/localBusType/add",
-        method: "post",
-        data: query
-    });
+  return axios({
+    url: "/udiwms/localBusType/add",
+    method: "post",
+    data: query
+  });
 }
 
 
 export function deleteLocalBusType(query) {
-    return axios({
-        url: "/udiwms/localBusType/delete",
-        method: "post",
-        data: query
-    });
+  return axios({
+    url: "/udiwms/localBusType/delete",
+    method: "post",
+    data: query
+  });
 }
 
 export function updateLocalBusType(query) {
-    return axios({
-        url: "/udiwms/localBusType/update",
-        method: "post",
-        data: query
-    });
+  return axios({
+    url: "/udiwms/localBusType/update",
+    method: "post",
+    data: query
+  });
 }
 
 export function filterForThirdSys() {
-    return axios({
-        url: "/udiwms/localBusType/filterForThirdSys",
-        method: "get",
-        param: null
-    })
+  return axios({
+    url: "/udiwms/localBusType/filterForThirdSys",
+    method: "get",
+    param: null
+  })
 }
diff --git a/src/api/basic/udiRelevance.js b/src/api/basic/udiRelevance.js
index b82965db..d17afd06 100644
--- a/src/api/basic/udiRelevance.js
+++ b/src/api/basic/udiRelevance.js
@@ -103,6 +103,14 @@ export function addAllErp(query) {
   });
 }
 
+export function updateById(query) {
+  return axios({
+    url: "/udi/udirel/updateById",
+    method: "post",
+    data: query
+  });
+}
+
 
 export function updateErpProduct(query) {
   return axios({
diff --git a/src/api/basic/udiRlSuptRelevance.js b/src/api/basic/udiRlSuptRelevance.js
index 19e6e226..8fee276b 100644
--- a/src/api/basic/udiRlSuptRelevance.js
+++ b/src/api/basic/udiRlSuptRelevance.js
@@ -1,43 +1,43 @@
 import axios from "@/utils/request";
 
 export function filterCompanyProductRelevance(query) {
-    return axios(
-        {
-            url: "/sale/info/company/product/relevance/filter",
-            method: "get",
-            params: query
-        }
-    )
+  return axios(
+    {
+      url: "/sale/info/company/product/relevance/filter",
+      method: "get",
+      params: query
+    }
+  )
 }
 export function insertFilter(query) {
-    return axios(
-        {
-            url: "/sale/info/insertFilter",
-            method: "post",
-            data: query
-        }
-    );
+  return axios(
+    {
+      url: "/sale/info/insertFilter",
+      method: "post",
+      data: query
+    }
+  );
 }
 
 export function insertCompanyProductRelevance(query) {
-    return axios(
-        {
-            url: "/sale/info/insertCompanyProductRelevance",
-            method: "post",
-            data: query
-        }
-    );
+  return axios(
+    {
+      url: "/sale/info/insertCompanyProductRelevance",
+      method: "post",
+      data: query
+    }
+  );
 }
 
 
 export function deleteCompanyProductRelevance(query) {
-    return axios(
-        {
-            url: "/sale/info/deleteCompanyProductRelevance",
-            method: "post",
-            data: query
-        }
-    );
+  return axios(
+    {
+      url: "/sale/info/deleteCompanyProductRelevance",
+      method: "post",
+      data: query
+    }
+  );
 }
 
 
diff --git a/src/api/inout/innerOrderQRCode.js b/src/api/inout/innerOrderQRCode.js
index e722a465..4dfcb91b 100644
--- a/src/api/inout/innerOrderQRCode.js
+++ b/src/api/inout/innerOrderQRCode.js
@@ -5,23 +5,23 @@ import axios from '@/utils/request'
 
 // 获取列表
 export function stockQRCodeText(query) {
-    return axios(
-        {
-            url: "/udiwms/stock/qrcode/text/filter",
-            method: "get",
-            params: query
-        }
-    )
+  return axios(
+    {
+      url: "/udiwms/stock/qrcode/text/filter",
+      method: "get",
+      params: query
+    }
+  )
 }
 
 export function filterPrint(query) {
-    return axios(
-        {
-            url: "/udiwms/innerOrderPrint/filter",
-            method: "get",
-            params: query
-        }
-    )
+  return axios(
+    {
+      url: "/udiwms/innerOrderPrint/filter",
+      method: "get",
+      params: query
+    }
+  )
 }
 export function generateInnerQRCodeText(query) {
   return axios({
diff --git a/src/api/inout/order.js b/src/api/inout/order.js
index 59da4dc4..031b8d65 100644
--- a/src/api/inout/order.js
+++ b/src/api/inout/order.js
@@ -421,13 +421,8 @@ export function getOrderList(params) {
     params: params
   });
 }
-export function getOrderFilter(params) {
-  return axios({
-    url: "udiwms/inout/preInorder/filter",
-    method: "get",
-    params: params
-  });
-}
+
+
 export function updateStatus(query) {
   return axios({
     url: "/spms/inout/order/web/updateStatus",
@@ -502,15 +497,19 @@ export function submitOrderToThrSys(params) {
   });
 }
 
-export function orderChange(query) {
+export function updateOrderDetailBiz(params) {
   return axios({
-    url: "/udiwms/stock/order/change",
+    url: "/udiwms/inout/order/updateOrderDetailBiz",
     method: "post",
-    data: query
+    data: params
   });
 }
 
 
-
-
-
+export function orderDetailAdd(params) {
+  return axios({
+    url: "/inv/inner/order/orderDetailAdd",
+    method: "post",
+    data: params
+  });
+}
diff --git a/src/api/inout/stockOrder.js b/src/api/inout/stockOrder.js
index ebb75a48..aaa3eb1d 100644
--- a/src/api/inout/stockOrder.js
+++ b/src/api/inout/stockOrder.js
@@ -5,293 +5,293 @@ import axios from '@/utils/request'
 
 // 获取列表
 export function stockOrderList(query) {
-    return axios({
-        url: "/udiwms/stock/order/filter",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/udiwms/stock/order/filter",
+    method: "get",
+    params: query
+  });
 }
 
 
 // 获取列表
 export function stockListDetail(query) {
-    return axios({
-        url: "/udiwms/stock/order/filterDetail",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/udiwms/stock/order/filterDetail",
+    method: "get",
+    params: query
+  });
 }
 
 export function stockOrderDetail(query) {
-    return axios(
-        {
-            url: "/udiwms/stock/order/detail/filter",
-            method: "get",
-            params: query
-        }
-    )
+  return axios(
+    {
+      url: "/udiwms/stock/order/detail/filter",
+      method: "get",
+      params: query
+    }
+  )
 }
 
 export function stockOrderDetail2(query) {
-    return axios(
-        {
-            url: "/udiwms/stock/order/detail/filter2",
-            method: "get",
-            params: query
-        }
-    )
+  return axios(
+    {
+      url: "/udiwms/stock/order/detail/filter2",
+      method: "get",
+      params: query
+    }
+  )
 }
 
 export function stockOrderDetailTemp(query) {
-    return axios(
-        {
-            url: "/udiwms/stock/order/detail/temp/filter",
-            method: "get",
-            params: query
-        }
-    )
+  return axios(
+    {
+      url: "/udiwms/stock/order/detail/temp/filter",
+      method: "get",
+      params: query
+    }
+  )
 }
 
 
 export function insertStockOrderWeb(query) {
-    return axios({
-        url: "/udiwms/stock/order/insertWeb",
-        method: "post",
-        data: query
-    });
+  return axios({
+    url: "/udiwms/stock/order/insertWeb",
+    method: "post",
+    data: query
+  });
 }
 
 
 export function deleteStockOrderById(query) {
-    return axios({
-        url: "/udiwms/stock/order/delete",
-        method: "post",
-        data: query
-    });
+  return axios({
+    url: "/udiwms/stock/order/delete",
+    method: "post",
+    data: query
+  });
 }
 
 export function deleteErrorStockOrderById(query) {
-    return axios({
-        url: "/udiwms/stock/order/error/delete",
-        method: "post",
-        data: query
-    });
+  return axios({
+    url: "/udiwms/stock/order/error/delete",
+    method: "post",
+    data: query
+  });
 }
 
 export function deleteStockOrderDetailById(query) {
-    return axios({
-        url: "/udiwms/stock/order/detail/delete",
-        method: "post",
-        data: query
-    });
+  return axios({
+    url: "/udiwms/stock/order/detail/delete",
+    method: "post",
+    data: query
+  });
 }
 
 export function deleteStockOrderDetailTempById(query) {
-    return axios({
-        url: "/udiwms/stock/order/detail/temp/delete",
-        method: "post",
-        data: query
-    });
+  return axios({
+    url: "/udiwms/stock/order/detail/temp/delete",
+    method: "post",
+    data: query
+  });
 }
 
 
 export function submitStockOrder(query) {
-    return axios({
-        url: "/udiwms/stock/order/submit",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/udiwms/stock/order/submit",
+    method: "get",
+    params: query
+  });
 }
 
 export function updateStockOrder(query) {
-    return axios({
-        url: "/udiwms/stock/order/update",
-        method: "post",
-        data: query
-    });
+  return axios({
+    url: "/udiwms/stock/order/update",
+    method: "post",
+    data: query
+  });
 }
 
 
 export function submitNewStockOrder(query) {
-    return axios({
-        url: "/udiwms/stock/order/new/submit",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/udiwms/stock/order/new/submit",
+    method: "get",
+    params: query
+  });
 }
 
 export function repealSubmitNewStockOrder(query) {
-    return axios({
-        url: "/udiwms/stock/order/new/repealSubmit",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/udiwms/stock/order/new/repealSubmit",
+    method: "get",
+    params: query
+  });
 }
 
 export function submitStockOrderError(query) {
-    return axios({
-        url: "/udiwms/stock/order/error/submit",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/udiwms/stock/order/error/submit",
+    method: "get",
+    params: query
+  });
 }
 
 export function uploadStockOrderDetailCount(query) {
-    return axios(
-        {
-            url: "/udiwms/stock/order/detail/uploadCount",
-            method: "get",
-            params: query
-        }
-    )
+  return axios(
+    {
+      url: "/udiwms/stock/order/detail/uploadCount",
+      method: "get",
+      params: query
+    }
+  )
 }
 
 export function getStockOrderDetailInstrument(query) {
-    return axios(
-        {
-            url: "/udiwms/stock/order/detail/getInstrument",
-            method: "get",
-            params: query
-        }
-    )
+  return axios(
+    {
+      url: "/udiwms/stock/order/detail/getInstrument",
+      method: "get",
+      params: query
+    }
+  )
 }
 
 export function getStockOrderDetailInstrumentById(query) {
-    return axios(
-        {
-            url: "/udiwms/stock/order/detail/getInstrumentById",
-            method: "post",
-            data: query
-        }
-    )
+  return axios(
+    {
+      url: "/udiwms/stock/order/detail/getInstrumentById",
+      method: "post",
+      data: query
+    }
+  )
 }
 
 export function addStockOrderDetailFromCode(query) {
-    return axios(
-        {
-            url: "/udiwms/stock/order/detail/addFromCode",
-            method: "get",
-            params: query
-        }
-    )
+  return axios(
+    {
+      url: "/udiwms/stock/order/detail/addFromCode",
+      method: "get",
+      params: query
+    }
+  )
 }
 
 export function addStockOrderDetailFromCodeById(query) {
-    return axios(
-        {
-            url: "/udiwms/stock/order/detail/addFromCodeById",
-            method: "get",
-            params: query
-        }
-    )
+  return axios(
+    {
+      url: "/udiwms/stock/order/detail/addFromCodeById",
+      method: "get",
+      params: query
+    }
+  )
 }
 
 export function stockOrderDetailQueryProduct(query) {
-    return axios(
-        {
-            url: "/udiwms/stock/order/detail/queryProduct",
-            method: "get",
-            params: query
-        }
-    )
+  return axios(
+    {
+      url: "/udiwms/stock/order/detail/queryProduct",
+      method: "get",
+      params: query
+    }
+  )
 }
 
 export function stockOrderDetailFilterProduct(query) {
-    return axios(
-        {
-            url: "/udiwms/stock/order/detail/filterProduct",
-            method: "get",
-            params: query
-        }
-    )
+  return axios(
+    {
+      url: "/udiwms/stock/order/detail/filterProduct",
+      method: "get",
+      params: query
+    }
+  )
 }
 
 export function filterAllProduct(query) {
-    return axios(
-        {
-            url: "/udiwms/inner/order/filterProduct",
-            method: "get",
-            params: query
-        }
-    )
+  return axios(
+    {
+      url: "/udiwms/inner/order/filterProduct",
+      method: "get",
+      params: query
+    }
+  )
 }
 
 
 export function uploadStockOrderDetail(query) {
-    return axios(
-        {
-            url: "/udiwms/stock/order/detail/upload",
-            method: "get",
-            params: query
-        }
-    )
+  return axios(
+    {
+      url: "/udiwms/stock/order/detail/upload",
+      method: "get",
+      params: query
+    }
+  )
 }
 
 export function copyStockOrderDetail(query) {
-    return axios(
-        {
-            url: "/udiwms/stock/order/detail/copy",
-            method: "get",
-            params: query
-        }
-    )
+  return axios(
+    {
+      url: "/udiwms/stock/order/detail/copy",
+      method: "get",
+      params: query
+    }
+  )
 }
 
 
 export function generateStockOrderQRCodeText(query) {
-    return axios({
-        url: "/udiwms/stock/order/qrcode/generate/text",
-        method: "post",
-        data: query
-    });
+  return axios({
+    url: "/udiwms/stock/order/qrcode/generate/text",
+    method: "post",
+    data: query
+  });
 }
 
 
 
 
 export function stockOrderGenerateBillNo(query) {
-    return axios({
-        url: "/udiwms/stock/order/generateBillNo",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/udiwms/stock/order/generateBillNo",
+    method: "get",
+    params: query
+  });
 }
 
 export function generateBillNoInt(query) {
-    return axios({
-        url: "/udiwms/stock/order/generateBillNoInt",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/udiwms/stock/order/generateBillNoInt",
+    method: "get",
+    params: query
+  });
 }
 
 
 export function supplementOrder(query) {
-    return axios({
-        url: "/udiwms/stock/order/supplementOrder",
-        method: 'get',
-        params: query
-    });
+  return axios({
+    url: "/udiwms/stock/order/supplementOrder",
+    method: 'get',
+    params: query
+  });
 }
 
 
 export function stockOrderChange(query) {
 
-    return axios({
-        url: "/udiwms/stock/order/change",
-        method: "post",
-        data: query
-    });
+  return axios({
+    url: "/udiwms/stock/order/change",
+    method: "post",
+    data: query
+  });
 }
 
 
 export function updateStatus(query) {
 
-    return axios({
-        url: "/spms/inout/order/web/updateStatus",
-        method: "post",
-        data: query
-    });
+  return axios({
+    url: "/spms/inout/order/web/updateStatus",
+    method: "post",
+    data: query
+  });
 }
 
 
diff --git a/src/api/inout/stockQRCode.js b/src/api/inout/stockQRCode.js
index 5906091b..834cd234 100644
--- a/src/api/inout/stockQRCode.js
+++ b/src/api/inout/stockQRCode.js
@@ -5,23 +5,23 @@ import axios from '@/utils/request'
 
 // 获取列表
 export function stockQRCodeText(query) {
-    return axios(
-        {
-            url: "/udiwms/stock/qrcode/text/filter",
-            method: "get",
-            params: query
-        }
-    )
+  return axios(
+    {
+      url: "/udiwms/stock/qrcode/text/filter",
+      method: "get",
+      params: query
+    }
+  )
 }
 
 export function filterPrint(query) {
-    return axios(
-        {
-            url: "/spms/stockPrint/filter",
-            method: "get",
-            params: query
-        }
-    )
+  return axios(
+    {
+      url: "/spms/stockPrint/filter",
+      method: "get",
+      params: query
+    }
+  )
 }
 
 
diff --git a/src/api/inventory/innerOrder.js b/src/api/inventory/innerOrder.js
index bd2705be..e34529dd 100644
--- a/src/api/inventory/innerOrder.js
+++ b/src/api/inventory/innerOrder.js
@@ -1,89 +1,89 @@
 import axios from "@/utils/request";
 
 export function listInnerOrder(query) {
-    return axios({
-        url: '/inv/inner/order/list',
-        method: 'get',
-        params: query
-    })
+  return axios({
+    url: '/inv/inner/order/list',
+    method: 'get',
+    params: query
+  })
 }
 
 export function auditListInnerOrder(query) {
-    return axios({
-        url: '/inv/inner/order/auditList',
-        method: 'get',
-        params: query
-    })
+  return axios({
+    url: '/inv/inner/order/auditList',
+    method: 'get',
+    params: query
+  })
 }
 
 
 
 export function listInnerOrderDetail(query) {
-    return axios({
-        url: '/inv/inner/order/list/detail',
-        method: 'post',
-        data: query
-    })
+  return axios({
+    url: '/inv/inner/order/list/detail',
+    method: 'post',
+    data: query
+  })
 }
 
 export function getInnerOrder(id) {
-    return axios({
-        url: '/inv/inner/order/' + id,
-        method: 'get'
-    })
+  return axios({
+    url: '/inv/inner/order/' + id,
+    method: 'get'
+  })
 }
 
 export function addInnerOrder(data) {
-    return axios({
-        url: '/inv/inner/order',
-        method: 'post',
-        data: data
-    })
+  return axios({
+    url: '/inv/inner/order',
+    method: 'post',
+    data: data
+  })
 }
 
 
 export function auditOrder(data) {
-    return axios({
-        url: '/inv/inner/order/auditOrder',
-        method: 'post',
-        data: data
-    })
+  return axios({
+    url: '/inv/inner/order/auditOrder',
+    method: 'post',
+    data: data
+  })
 }
 
 
 
 // 修改pur
 export function updateInnerOrder(data) {
-    return axios({
-        url: '/inv/inner/order',
-        method: 'put',
-        data: data
-    })
+  return axios({
+    url: '/inv/inner/order',
+    method: 'put',
+    data: data
+  })
 }
 
 // 删除pur
 export function delInnerOrder(id) {
-    return axios({
-        url: '/inv/inner/order/' + id,
-        method: 'delete'
-    })
+  return axios({
+    url: '/inv/inner/order/' + id,
+    method: 'delete'
+  })
 }
 
 export function inserThrOrderWeb(query) {
-    return axios({
-        url: "/inv/inner/order/postOrder",
-        method: "post",
-        data: query
-    });
+  return axios({
+    url: "/inv/inner/order/postOrder",
+    method: "post",
+    data: query
+  });
 }
 
 
 // 删除pur
 export function delInnerOrderDetail(id) {
-    return axios({
-        url: '/inv/inner/order/detail/' + id,
-        method: 'delete'
-    })
+  return axios({
+    url: '/inv/inner/order/detail/' + id,
+    method: 'delete'
+  })
 }
 
 
diff --git a/src/api/itextpdf/itextpdf.js b/src/api/itextpdf/itextpdf.js
index ffb51774..c45faa3a 100644
--- a/src/api/itextpdf/itextpdf.js
+++ b/src/api/itextpdf/itextpdf.js
@@ -1,121 +1,121 @@
 import axios from "@/utils/request";
 
 export function codeList(query) {
-    return axios({
-        url: "/admin/warehouse/inout/findByOrderId",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/admin/warehouse/inout/findByOrderId",
+    method: "get",
+    params: query
+  });
 }
 
 export function downloadInoutOrderSuccessPDF(query) {
-    return axios({
-        url: "/udiwms/pdf/download/inout/order/success",
-        method: "post",
-        data: query,
-        headers: {'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'},
-        responseType: 'arraybuffer',   //一定要设置响应类型，否则页面会是空白pdf
-    });
+  return axios({
+    url: "/udiwms/pdf/download/inout/order/success",
+    method: "post",
+    data: query,
+    headers: {'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'},
+    responseType: 'arraybuffer',   //一定要设置响应类型，否则页面会是空白pdf
+  });
 }
 
 export function orderDetailPDFFromTemplateCode(query) {
-    return axios({
-        url: "/udiwms/pdf/template/order/detail/code",
-        method: "post",
-        data: query,
-        headers: {'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'},
-        responseType: 'arraybuffer',   //一定要设置响应类型，否则页面会是空白pdf
-    });
+  return axios({
+    url: "/udiwms/pdf/template/order/detail/code",
+    method: "post",
+    data: query,
+    headers: {'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'},
+    responseType: 'arraybuffer',   //一定要设置响应类型，否则页面会是空白pdf
+  });
 }
 
 export function orderDetailPDFFromTemplateFile(query) {
-    return axios({
-        url: "/udiwms/pdf/template/order/detail/file",
-        method: "post",
-        data: query,
-        headers: {'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'},
-        responseType: 'arraybuffer',   //一定要设置响应类型，否则页面会是空白pdf
-    });
+  return axios({
+    url: "/udiwms/pdf/template/order/detail/file",
+    method: "post",
+    data: query,
+    headers: {'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'},
+    responseType: 'arraybuffer',   //一定要设置响应类型，否则页面会是空白pdf
+  });
 }
 
 export function inspectionOrderDetailPDFFromTemplateCode(query) {
-    return axios({
-        url: "/udiwms/pdf/template/inspection/order/detail/code",
-        method: "post",
-        data: query,
-    });
+  return axios({
+    url: "/udiwms/pdf/template/inspection/order/detail/code",
+    method: "post",
+    data: query,
+  });
 }
 
 export function inspectionOrderDetailPDFFromTemplateFile(query) {
-    return axios({
-        url: "/udiwms/pdf/template/inspection/order/detail/file",
-        method: "post",
-        data: query,
-    });
+  return axios({
+    url: "/udiwms/pdf/template/inspection/order/detail/file",
+    method: "post",
+    data: query,
+  });
 }
 
 //---------打印码
 export function inspectionStockQRCodeTextPDFFromTemplateFile(query) {
-    return axios({
-        url: "/udiwms/pdf/template/inspection/stock/qrcode/text/file",
-        method: "post",
-        data: query,
-    });
+  return axios({
+    url: "/udiwms/pdf/template/inspection/stock/qrcode/text/file",
+    method: "post",
+    data: query,
+  });
 }
 export function stockQRCodeTextPDFFromTemplateFile(query) {
-    return axios({
-        url: "/udiwms/pdf/template/stock/qrcode/text/file",
-        method: "post",
-        data: query,
-        headers: {'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'},
-        responseType: 'arraybuffer',   //一定要设置响应类型，否则页面会是空白pdf
-    });
+  return axios({
+    url: "/udiwms/pdf/template/stock/qrcode/text/file",
+    method: "post",
+    data: query,
+    headers: {'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'},
+    responseType: 'arraybuffer',   //一定要设置响应类型，否则页面会是空白pdf
+  });
 }
 export function stockQRCodeTextPDFFromTemplateFileMax(query) {
-    return axios({
-        url: "/udiwms/pdf/template/stock/qrcode/text/maxfile",
-        method: "post",
-        data: query,
-    });
+  return axios({
+    url: "/udiwms/pdf/template/stock/qrcode/text/maxfile",
+    method: "post",
+    data: query,
+  });
 }
 export function filterTemp(query) {
-    return axios({
-        url: "/spms/stock/qrcode/filterTemp",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/spms/stock/qrcode/filterTemp",
+    method: "get",
+    params: query
+  });
 }
 
 
 
 //---------打印订单
 export function inspectionStockOrderPDFFromTemplateFile(query) {
-    return axios({
-        url: "/udiwms/pdf/template/inspection/stock/order/file",
-        method: "post",
-        data: query,
-    });
+  return axios({
+    url: "/udiwms/pdf/template/inspection/stock/order/file",
+    method: "post",
+    data: query,
+  });
 }
 
 export function stockOrderPDFFromTemplateFile(query) {
-    return axios({
-        url: "/udiwms/pdf/template/stock/order/file",
-        method: "post",
-        data: query,
-        headers: {'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'},
-        responseType: 'arraybuffer',   //一定要设置响应类型，否则页面会是空白pdf
-    });
+  return axios({
+    url: "/udiwms/pdf/template/stock/order/file",
+    method: "post",
+    data: query,
+    headers: {'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'},
+    responseType: 'arraybuffer',   //一定要设置响应类型，否则页面会是空白pdf
+  });
 }
 
 
 export function demoPrint(query) {
-    return axios({
-        url: "/system/pdf/template/demoPrint",
-        method: "post",
-        data: query,
-        headers: {'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'},
-        responseType: 'arraybuffer',   //一定要设置响应类型，否则页面会是空白pdf
-    });
+  return axios({
+    url: "/system/pdf/template/demoPrint",
+    method: "post",
+    data: query,
+    headers: {'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'},
+    responseType: 'arraybuffer',   //一定要设置响应类型，否则页面会是空白pdf
+  });
 }
 
 
diff --git a/src/views/basic/business/stockOrder.vue b/src/views/basic/business/stockOrder.vue
index cb5fc6c9..7fc3c662 100644
--- a/src/views/basic/business/stockOrder.vue
+++ b/src/views/basic/business/stockOrder.vue
@@ -3,18 +3,16 @@
     <el-card class="el-card">
       <el-form :model="query" label-width="100px" v-show="showSearch">
         <el-row style="width: 100%">
-          <el-col :span="6">
+          <el-col :span="8">
             <el-form-item label="单号:">
               <el-input v-model="query.billNo" style="width: 90%" placeholder="请输入单号" clearable></el-input>
             </el-form-item>
           </el-col>
-
-          <el-col :span="6">
-
-            <el-form-item label="状态：" prop="inCodeStatus">
+          <el-col :span="8">
+            <el-form-item label="打印状态：" prop="inCodeStatus" clearable>
               <el-select v-model="query.inCodeStatus" style="width: 90%">
-                <el-option label="未打印" value="1"></el-option>
-                <el-option label="已打印" value="2"></el-option>
+                <el-option label="未打印" :value="0"></el-option>
+                <el-option label="已打印" :value="1"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -25,7 +23,7 @@
           <!--            </el-form-item>-->
           <!--          </el-col>-->
 
-          <el-col :span="6">
+          <el-col :span="8">
             <el-form-item class="query-form-item" label="单据类型:">
               <el-select v-model="query.action" placeholder="请选择单据类型"
                          style="width: 90%"
@@ -40,7 +38,23 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+        </el-row>
+
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="单据状态:">
+              <el-select v-model="query.status" placeholder="请选择单据状态" style="width: 90%">
+                <el-option label="草稿" :value=1>草稿</el-option>
+                <el-option label="待校验" :value=3>待校验</el-option>
+                <el-option label="待核对" :value=5>待核对</el-option>
+                <el-option label="待审核" :value=10>待审核</el-option>
+                <el-option label="已审核" :value=7>已审核</el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+
+          <el-col :span="8">
             <el-form-item label="创建时间:">
               <el-date-picker
                 :picker-options="pickerOptions"
@@ -56,7 +70,6 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-
         </el-row>
 
       </el-form>
@@ -87,9 +100,9 @@
             <span>{{ enableMap[scope.row.inCodeStatus] }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="所属部门" prop="deptName" width="120">
+        <el-table-column label="采购部门" prop="deptName" width="120">
         </el-table-column>
-        <el-table-column label="所属仓库" prop="invName" width="150">
+        <el-table-column label="收货仓库" prop="invName" width="150">
         </el-table-column>
         <el-table-column label="单据来源" prop="fromType" width="120">
           <template slot-scope="scope">
@@ -126,7 +139,7 @@
         <el-table-column label="规格型号" prop="spec"></el-table-column>
         <el-table-column label="批次号" prop="batchNo"></el-table-column>
         <el-table-column label="单据数量" prop="count"></el-table-column>
-        <el-table-column label="实际数量" prop="reCount"></el-table-column>
+        <!--        <el-table-column label="实际数量" prop="scanCount"></el-table-column>-->
         <el-table-column label="生产日期" prop="productDate">
           <template slot-scope="scope">
             <span>{{ convertDateFun(scope.row.productDate) }}</span>
@@ -137,11 +150,9 @@
             <span>{{ convertDateFun(scope.row.expireDate) }}</span>
           </template>
         </el-table-column>
-
         <el-table-column label="价格" prop="price"></el-table-column>
         <el-table-column label="生产企业" prop="ylqxzcrbarmc"></el-table-column>
-        <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh"></el-table-column>
-
+        <el-table-column label="注册/备案号" prop="certCode"></el-table-column>
       </el-table>
 
       <pagination
@@ -154,7 +165,7 @@
     </el-card>
 
     <el-dialog
-      title="内部码详情"
+      title="内部码管理"
       :visible.sync="qrcodeDetailVisible"
       :close-on-click-modal="false"
       :close-on-press-escape="false"
@@ -185,11 +196,12 @@ import stockQRCodeExport from "./stockQRCodeExport";
 import draggable from "vuedraggable";
 import {inspectionStockOrderPDFFromTemplateFile, stockOrderPDFFromTemplateFile} from "@/api/itextpdf/itextpdf";
 import store from "@/store";
-import {getLocalJoinBusType, getLocalJoinByUser} from "@/api/basic/busLocalType";
+import {getLocalJoinBusType} from "@/api/basic/busLocalType";
 import {filterAll, filterAllByUser} from "@/api/system/invWarehouse";
 import {filterSubByInv, findInvByUser} from '@/api/system/invSubWarehouse'
 import {convertDate} from "@/utils/date"
 import {filterOrder} from "@/api/inout/order";
+import {getLocalJoinByUser} from "@/api/basic/busType";
 
 export default {
   name: "stockOrder",
@@ -204,11 +216,13 @@ export default {
         invWarehouseCode: this.$store.getters.locSubInvCode,
         billNo: "",
         status: "",
+        action: null,
+        statusType: "supInCode",
         page: 1,
         limit: 10,
         startTime: "",
         endTime: "",
-        inCodeStatus: null,
+        inCodeStatus: 1,
       },
       detailQuery: {
         orderIdFk: "",
@@ -313,12 +327,19 @@ export default {
         path: ""
       });
       this.query = {
+        billType: null,
+        corpName: null,
+        locStorageCode: this.$store.getters.locInvCode,
+        invWarehouseCode: this.$store.getters.locSubInvCode,
         billNo: "",
-        status: "3",
+        status: "",
+        action: null,
+        statusType: "supInCode",
         page: 1,
         limit: 10,
         startTime: "",
         endTime: "",
+        inCodeStatus: 1,
       };
       this.getList();
 
@@ -376,6 +397,7 @@ export default {
         this.query.startTime = null;
         this.query.endTime = null;
       }
+      this.query.vueType = "supDelivery";
       filterOrder(this.query)
         .then(response => {
           this.loading = false;
@@ -436,6 +458,7 @@ export default {
     getBusType() {
       let query = {
         enabled: true,
+        vueType: "supDelivery",
       };
       getLocalJoinByUser(query)
         .then((response) => {
diff --git a/src/views/basic/business/stockOrderDistribution.vue b/src/views/basic/business/stockOrderDistribution.vue
index 52ca1f3a..c961f12f 100644
--- a/src/views/basic/business/stockOrderDistribution.vue
+++ b/src/views/basic/business/stockOrderDistribution.vue
@@ -1,102 +1,102 @@
 <template>
-    <div>
+  <div>
 
-        <el-form :model="formData" :rules="formRules" ref="dataForm">
-            <el-button-group style="display: flex">
-                <el-button
-                    type="primary"
-                    @click.native="submit('0')"
-                    style="margin: -50px 60px 10px auto; height: 35px"
-                    :loading="loading"
-                >提交
-                </el-button
-                >
-            </el-button-group>
+    <el-form :model="formData" :rules="formRules" ref="dataForm">
+      <el-button-group style="display: flex">
+        <el-button
+          type="primary"
+          @click.native="submit('0')"
+          style="margin: -50px 60px 10px auto; height: 35px"
+          :loading="loading"
+        >提交
+        </el-button
+        >
+      </el-button-group>
 
-            <el-row>
-                <el-col :span="11">
-                    <el-form-item label="单据号:" prop="billNo">
-                        <el-input v-model="formData.billNo" auto-complete="off" :disabled="true"></el-input>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="11">
-                    <el-form-item label="单据状态:" prop="status">
-                        <el-input v-model="statusMap[formData.status]" auto-complete="off" :disabled="true"></el-input>
-                    </el-form-item>
-                </el-col>
-            </el-row>
+      <el-row>
+        <el-col :span="11">
+          <el-form-item label="单据号:" prop="billNo">
+            <el-input v-model="formData.billNo" auto-complete="off" :disabled="true"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="11">
+          <el-form-item label="单据状态:" prop="status">
+            <el-input v-model="statusMap[formData.status]" auto-complete="off" :disabled="true"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
 
-            <el-row>
-                <el-col :span="11">
-                    <el-form-item label="单据日期:" prop="billdate">
-                        <el-input v-model="formData.billdate" auto-complete="off" :disabled="true"></el-input>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="11">
-                    <el-form-item label="供应商:" prop="corpName">
-                        <el-input v-model="formData.corpName" auto-complete="off" :disabled="true"></el-input>
-                    </el-form-item>
-                </el-col>
-            </el-row>
+      <el-row>
+        <el-col :span="11">
+          <el-form-item label="单据日期:" prop="billdate">
+            <el-input v-model="formData.billdate" auto-complete="off" :disabled="true"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="11">
+          <el-form-item label="供应商:" prop="corpName">
+            <el-input v-model="formData.corpName" auto-complete="off" :disabled="true"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
 
-            <el-row>
-                <el-col :span="11">
-                    <el-form-item label="业务类型:" prop="billType">
-                        <el-select v-model="formData.billType" placeholder="请选择业务类型" clearable="true" disabled="true">
-                            <el-option
-                                v-for="item in busTypes"
-                                :key="item.name"
-                                :label="item.name"
-                                :value="item.action">
-                                <span style="float: left">{{ item.name }}</span>
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="11">
-                    <el-form-item label="采购类型:" prop="type">
-                        <el-input v-model="typeMap[formData.type]" auto-complete="off" :disabled="true"></el-input>
-                    </el-form-item>
-                </el-col>
-            </el-row>
+      <el-row>
+        <el-col :span="11">
+          <el-form-item label="业务类型:" prop="billType">
+            <el-select v-model="formData.billType" placeholder="请选择业务类型" clearable="true" disabled="true">
+              <el-option
+                v-for="item in busTypes"
+                :key="item.name"
+                :label="item.name"
+                :value="item.action">
+                <span style="float: left">{{ item.name }}</span>
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="11">
+          <el-form-item label="采购类型:" prop="type">
+            <el-input v-model="typeMap[formData.type]" auto-complete="off" :disabled="true"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
 
-            <el-row>
-                <el-col :span="15">
-                    <el-form-item label="条码:" prop="code">
-                        <el-input
-                            @focus="getInputFocus($event)"
-                            @keypress.enter.native="addCode()"
-                            v-model="code"
-                            auto-complete="off"
-                            ref='inputRef'
-                        ></el-input>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="2">
-                    <el-button type="primary" size="small" @click.native.stop="addCode()" style="height: 31px; margin-left: 10px">添加</el-button>
-                </el-col>
-            </el-row>
+      <el-row>
+        <el-col :span="15">
+          <el-form-item label="条码:" prop="code">
+            <el-input
+              @focus="getInputFocus($event)"
+              @keypress.enter.native="addCode()"
+              v-model="code"
+              auto-complete="off"
+              ref='inputRef'
+            ></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="2">
+          <el-button type="primary" size="small" @click.native.stop="addCode()" style="height: 31px; margin-left: 10px">添加</el-button>
+        </el-col>
+      </el-row>
 
-            <el-table v-loading="loading" :data="codeArray" style="width: 100%;" border max-height="350" height="350" ref="multipleTable">
-                <el-table-column label="序号" type="index" width="50"></el-table-column>
-                <el-table-column label="物资名称" prop="productName" show-overflow-tooltip width="200"></el-table-column>
-                <el-table-column label="包装规格" prop="spec" show-overflow-tooltip width="200"></el-table-column>
-                <el-table-column label="批次号" prop="batchNo" show-overflow-tooltip></el-table-column>
-                <el-table-column label="生产日期" prop="productDate" show-overflow-tooltip></el-table-column>
-                <el-table-column label="失效日期" prop="expireDate" show-overflow-tooltip></el-table-column>
-                <el-table-column label="扫码数量" prop="sweepCount" show-overflow-tooltip></el-table-column>
-            </el-table>
-            <div class="block">
-              <pagination
-                v-show="total>0"
-                :total="total"
-                :limit.sync="query.limit"
-                :page.sync="query.page"
-                @pagination="handleCurrentChange"
-              ></pagination>
-            </div>
-        </el-form>
-    </div>
+      <el-table v-loading="loading" :data="codeArray" style="width: 100%;" border max-height="350" height="350" ref="multipleTable">
+        <el-table-column label="序号" type="index" width="50"></el-table-column>
+        <el-table-column label="物资名称" prop="productName" show-overflow-tooltip width="200"></el-table-column>
+        <el-table-column label="包装规格" prop="spec" show-overflow-tooltip width="200"></el-table-column>
+        <el-table-column label="批次号" prop="batchNo" show-overflow-tooltip></el-table-column>
+        <el-table-column label="生产日期" prop="productDate" show-overflow-tooltip></el-table-column>
+        <el-table-column label="失效日期" prop="expireDate" show-overflow-tooltip></el-table-column>
+        <el-table-column label="扫码数量" prop="sweepCount" show-overflow-tooltip></el-table-column>
+      </el-table>
+      <div class="block">
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :limit.sync="query.limit"
+          :page.sync="query.page"
+          @pagination="handleCurrentChange"
+        ></pagination>
+      </div>
+    </el-form>
+  </div>
 </template>
 
 <script>
@@ -104,207 +104,207 @@ import {stockOrderDetail, submitStockOrder, submitStockOrderError, uploadStockOr
 import draggable from "vuedraggable";
 import {getLocalJoinBusType} from "@/api/basic/busLocalType";
 export default {
-    name: "idQuery",
-    props: {
-        closeDialog: {
-            type: Function,
-            required: true,
-        },
-        idQuery: {
-            type: Object,
-            required: true,
-        },
+  name: "idQuery",
+  props: {
+    closeDialog: {
+      type: Function,
+      required: true,
     },
-    data() {
-        return {
-            code: "",
-            query: {
-                orderIdFk: "",
-                page: 1,
-                limit: 10,
-            },
-            formData: {},
-            formRules: {
-                corpName: [
-                    {required: true, message: "请输入供应商", trigger: "blur"}
-                ],
-                billdate: [
-                    {required: true, message: "请输入单据日期", trigger: "blur"}
-                ],
-                billType: [
-                    {required: true, message: "请选择业务类型", trigger: "blur"}
-                ],
-                // type: [
-                //     {required: true, message: "请选择采购类型", trigger: "blur"}
-                // ],
-            },
-            codeArray: [],
-            total: 0,
-            loading: false,
-            index: null,
-            formLoading: false,
-            formVisible: false,
-            deleteLoading: false,
-            orderNo: null,
-            statusMap: {
-                101: "未处理",
-                102: "已处理",
-                201: "未配货",
-                202: "已配货",
-                301: "已打印",
-                401: "异常",
-                501: "未提交",
-                502: "已提交",
-            },
-            typeMap: {
-                1: "预入库",
-                2: "普通采购",
-            },
-            busTypes: [],
-        };
+    idQuery: {
+      type: Object,
+      required: true,
     },
-    components: {
-        draggable,
-    },
-    methods: {
-        submit(formName) {
-            if (this.total < 1) {
-                this.$message.error('未配货');
-                return;
+  },
+  data() {
+    return {
+      code: "",
+      query: {
+        orderIdFk: "",
+        page: 1,
+        limit: 10,
+      },
+      formData: {},
+      formRules: {
+        corpName: [
+          {required: true, message: "请输入供应商", trigger: "blur"}
+        ],
+        billdate: [
+          {required: true, message: "请输入单据日期", trigger: "blur"}
+        ],
+        billType: [
+          {required: true, message: "请选择业务类型", trigger: "blur"}
+        ],
+        // type: [
+        //     {required: true, message: "请选择采购类型", trigger: "blur"}
+        // ],
+      },
+      codeArray: [],
+      total: 0,
+      loading: false,
+      index: null,
+      formLoading: false,
+      formVisible: false,
+      deleteLoading: false,
+      orderNo: null,
+      statusMap: {
+        101: "未处理",
+        102: "已处理",
+        201: "未配货",
+        202: "已配货",
+        301: "已打印",
+        401: "异常",
+        501: "未提交",
+        502: "已提交",
+      },
+      typeMap: {
+        1: "预入库",
+        2: "普通采购",
+      },
+      busTypes: [],
+    };
+  },
+  components: {
+    draggable,
+  },
+  methods: {
+    submit(formName) {
+      if (this.total < 1) {
+        this.$message.error('未配货');
+        return;
+      }
+      this.$confirm("是否提交？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        let tQuery = {
+          id: this.idQuery.id
+        }
+        this.loading = true;
+        submitStockOrder(tQuery)
+          .then((response) => {
+            this.loading = false;
+            if (response.code === 20000) {
+              this.$message.success("提交成功");
+              this.closeDialog(true);
+            } else {
+              this.$message.error(response.message);
             }
-            this.$confirm("是否提交？", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            }).then(() => {
-                let tQuery = {
-                    id: this.idQuery.id
-                }
-                this.loading = true;
-                submitStockOrder(tQuery)
-                    .then((response) => {
-                        this.loading = false;
-                        if (response.code === 20000) {
-                            this.$message.success("提交成功");
-                            this.closeDialog(true);
-                        } else {
-                            this.$message.error(response.message);
-                        }
-                    });
-            }).catch(() => {
-                this.loading = false;
-            });
-        },
+          });
+      }).catch(() => {
+        this.loading = false;
+      });
+    },
+    // 刷新表单
+    resetForm() {
+      if (this.$refs["dataForm"]) {
+        // 清空验证信息表单
+        this.$refs["dataForm"].clearValidate();
         // 刷新表单
-        resetForm() {
-            if (this.$refs["dataForm"]) {
-                // 清空验证信息表单
-                this.$refs["dataForm"].clearValidate();
-                // 刷新表单
-                this.$refs["dataForm"].resetFields();
-                this.getList();
-            }
-        },
-        addCode() {
-            this.code = this.code.trim();
-            if (this.$isBlank(this.code)) return;
-            this.loading = true;
-            let tQuery = {
-                orderId: this.idQuery.id,
-                code: this.code,
-            };
+        this.$refs["dataForm"].resetFields();
+        this.getList();
+      }
+    },
+    addCode() {
+      this.code = this.code.trim();
+      if (this.$isBlank(this.code)) return;
+      this.loading = true;
+      let tQuery = {
+        orderId: this.idQuery.id,
+        code: this.code,
+      };
 
-            //012693548470801311200226172302271020022632100025
-            uploadStockOrderDetailCount(tQuery).then((response) => {
-                this.loading = false;
-                if (response.code === 20000) {
-                    this.idQuery.id = response.data;
-                    this.getStockOrderDetailList();
-                } else {
-                    this.$alert(response.message, '提示', {
-                        confirmButtonText: '确定',
-                        type: 'warning',
-                        closeOnClickModal: true,
-                        callback: action => {
-                            this.$refs.inputRef.focus();
-                        }
-                    });
-                }
-            });
-        },
-        getInputFocus(event) {
-            event.currentTarget.select();
-        },
-        tableSelection() {
-            this.$refs.multipleTable.clearSelection();
-            this.$refs.multipleTable.toggleAllSelection();
-        },
-        handleSizeChange(val) {
-            this.query.limit = val;
-            this.getStockOrderDetailList();
-        },
-        handleCurrentChange(val) {
-            this.query.page = val.page;
-            this.getStockOrderDetailList();
-        },
-        getStockOrderDetailList() {
-            this.loading = true;
-            stockOrderDetail(this.query) //查找该单号下的所有条码
-                .then((response) => {
-                    console.log(response)
-                    this.codeArray = response.data.list || [];
-                    this.total = response.data.total || 0;
-                    this.loading = false;
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.list = [];
-                    this.total = 0;
-                });
-        },
-        intentBack() {
-            this.$router.go(-1);
-        },
-        getBusType() {
-            let query = {
-                enabled: true,
-            };
-            getLocalJoinBusType(query)
-                .then((response) => {
-                    this.busTypes = response.data.list || [];
-                })
-                .catch(() => {
-                });
-        },
+      //012693548470801311200226172302271020022632100025
+      uploadStockOrderDetailCount(tQuery).then((response) => {
+        this.loading = false;
+        if (response.code === 20000) {
+          this.idQuery.id = response.data;
+          this.getStockOrderDetailList();
+        } else {
+          this.$alert(response.message, '提示', {
+            confirmButtonText: '确定',
+            type: 'warning',
+            closeOnClickModal: true,
+            callback: action => {
+              this.$refs.inputRef.focus();
+            }
+          });
+        }
+      });
     },
-    filters: {},
-    mounted() {
-        document.body.ondrop = function (event) {
-            event.preventDefault();
-            event.stopPropagation();
-        };
+    getInputFocus(event) {
+      event.currentTarget.select();
     },
-    created() {
-        this.getBusType();
-        this.formData = {};
-        this.codeArray = [];
-        if (this.$isNotBlank(this.idQuery.id)) {
-            this.query.orderIdFk = this.idQuery.id;
-            this.formData = this.idQuery.formData;
-            this.getStockOrderDetailList();
-        }
+    tableSelection() {
+      this.$refs.multipleTable.clearSelection();
+      this.$refs.multipleTable.toggleAllSelection();
+    },
+    handleSizeChange(val) {
+      this.query.limit = val;
+      this.getStockOrderDetailList();
+    },
+    handleCurrentChange(val) {
+      this.query.page = val.page;
+      this.getStockOrderDetailList();
+    },
+    getStockOrderDetailList() {
+      this.loading = true;
+      stockOrderDetail(this.query) //查找该单号下的所有条码
+        .then((response) => {
+          console.log(response)
+          this.codeArray = response.data.list || [];
+          this.total = response.data.total || 0;
+          this.loading = false;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
+    },
+    intentBack() {
+      this.$router.go(-1);
+    },
+    getBusType() {
+      let query = {
+        enabled: true,
+      };
+      getLocalJoinBusType(query)
+        .then((response) => {
+          this.busTypes = response.data.list || [];
+        })
+        .catch(() => {
+        });
     },
+  },
+  filters: {},
+  mounted() {
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+  },
+  created() {
+    this.getBusType();
+    this.formData = {};
+    this.codeArray = [];
+    if (this.$isNotBlank(this.idQuery.id)) {
+      this.query.orderIdFk = this.idQuery.id;
+      this.formData = this.idQuery.formData;
+      this.getStockOrderDetailList();
+    }
+  },
 };
 </script>
 <style>
 
 .ao-text {
-    width: 100%;
-    font-size: 13px;
-    font-family: "Microsoft YaHei";
-    float: right;
-    text-align: right;
-    margin-top: 10px;
+  width: 100%;
+  font-size: 13px;
+  font-family: "Microsoft YaHei";
+  float: right;
+  text-align: right;
+  margin-top: 10px;
 }
 
 </style>
diff --git a/src/views/basic/business/stockOrderPrint.vue b/src/views/basic/business/stockOrderPrint.vue
new file mode 100644
index 00000000..268cf10d
--- /dev/null
+++ b/src/views/basic/business/stockOrderPrint.vue
@@ -0,0 +1,546 @@
+<template>
+  <div>
+    <el-card class="el-card">
+      <el-form :model="query" label-width="100px" v-show="showSearch">
+        <el-row style="width: 100%">
+          <el-col :span="8">
+            <el-form-item label="单号:">
+              <el-input v-model="query.billNo" style="width: 90%" placeholder="请输入单号" clearable></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="打印状态：" prop="inCodeStatus" clearable>
+              <el-select v-model="query.inCodeStatus" style="width: 90%">
+                <el-option label="未打印" :value="0"></el-option>
+                <el-option label="已打印" :value="1"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <!--          <el-col :span="8">-->
+          <!--            <el-form-item label="送货单位:">-->
+          <!--              <el-input v-model="query.corpName" style="width: 90%" placeholder="请输入送货单位" clearable></el-input>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
+
+          <el-col :span="8">
+            <el-form-item class="query-form-item" label="单据类型:">
+              <el-select v-model="query.action" placeholder="请选择单据类型"
+                         style="width: 90%"
+                         clearable>
+                <el-option
+                  v-for="item in busTypes"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.action">
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="单据状态:">
+              <el-select v-model="query.status" placeholder="请选择单据状态" style="width: 90%">
+                <el-option label="草稿" :value=1>草稿</el-option>
+                <el-option label="待校验" :value=3>待校验</el-option>
+                <el-option label="待核对" :value=5>待核对</el-option>
+                <el-option label="待审核" :value=10>待审核</el-option>
+                <el-option label="已审核" :value=7>已审核</el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+
+          <el-col :span="8">
+            <el-form-item label="创建时间:">
+              <el-date-picker
+                :picker-options="pickerOptions"
+                v-model="actDateRange"
+                type="daterange"
+                format="yyyy 年 MM 月 dd 日"
+                style="width: 90%"
+                value-format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+      </el-form>
+
+
+      <div class="top-right-btn">
+        <el-button-group style="display:flex;">
+          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+          <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="combine">选入</el-button>
+        </el-button-group>
+      </div>
+
+      <el-divider style="margin: 15px"></el-divider>
+
+
+      <el-table v-loading="loading" :data="list" style="width: 100%;" border highlight-current-row
+                @row-click="getStockOrderDetailList" ref="multipleTable">
+        <el-table-column type="index" label="序号" width="50"></el-table-column>
+        <el-table-column label="单据号" prop="billNo" width="140" show-overflow-tooltip></el-table-column>
+        <el-table-column label="单据类型" prop="billTypeName" width="120">
+        </el-table-column>
+        <el-table-column label="创建时间" prop="createTime" width="150"></el-table-column>
+        <el-table-column label="打印状态" width="100" prop="inCodeStatus">
+          <template slot-scope="scope">
+            <span>{{ enableMap[scope.row.inCodeStatus] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="采购部门" prop="deptName" width="120">
+        </el-table-column>
+        <el-table-column label="收货仓库" prop="invName" width="150">
+        </el-table-column>
+        <el-table-column label="单据来源" prop="fromType" width="120">
+          <template slot-scope="scope">
+            <span>{{ sourceMap[scope.row.fromType] }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :limit.sync="query.limit"
+        :page.sync="query.page"
+        @pagination="handleCurrentChange"
+      ></pagination>
+
+    </el-card>
+
+    <el-card class="el-card">
+      <el-table v-loading="detailLoading" :data="detailList" style="width: 100%" border>
+        <el-table-column type="index" label="序号" width="50"></el-table-column>
+        <el-table-column label="物资名称" prop="coName"></el-table-column>
+        <el-table-column label="规格型号" prop="spec"></el-table-column>
+        <el-table-column label="批次号" prop="batchNo"></el-table-column>
+        <el-table-column label="单据数量" prop="count"></el-table-column>
+        <!--        <el-table-column label="实际数量" prop="scanCount"></el-table-column>-->
+        <el-table-column label="生产日期" prop="productDate">
+          <template slot-scope="scope">
+            <span>{{ convertDateFun(scope.row.productDate) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="失效日期" prop="expireDate">
+          <template slot-scope="scope">
+            <span>{{ convertDateFun(scope.row.expireDate) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="价格" prop="price"></el-table-column>
+        <el-table-column label="生产企业" prop="ylqxzcrbarmc"></el-table-column>
+        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh"></el-table-column>
+      </el-table>
+
+      <pagination
+        v-show="detailTotal>0"
+        :total="detailTotal"
+        :limit.sync="detailQuery.limit"
+        :page.sync="detailQuery.page"
+        @pagination="detailHandleCurrentChange"
+      ></pagination>
+    </el-card>
+
+<!--    <el-dialog-->
+<!--      title="内部码管理"-->
+<!--      :visible.sync="qrcodeDetailVisible"-->
+<!--      :close-on-click-modal="false"-->
+<!--      :close-on-press-escape="false"-->
+<!--      width="70%"-->
+<!--      append-to-body-->
+<!--      v-if="qrcodeDetailVisible"-->
+<!--      @close='closeQRCodeDetailDialog'-->
+<!--    >-->
+<!--      <stockOrderQRCodeDetail-->
+<!--        :closeDialog="closeQRCodeDetailDialog"-->
+<!--        :idQuery="idQuery"-->
+<!--      ></stockOrderQRCodeDetail>-->
+<!--    </el-dialog>-->
+
+  </div>
+</template>
+
+<script>
+import {
+  stockorderQuery, stockOrderDetail, deleteStockOrderById, deleteStockOrderDetailById,
+  copyStockOrderDetail, submitStockOrder,
+  uploadStockOrderDetail, uploadStockOrderDetailCount,
+  generateStockOrderQRCodeText
+} from "@/api/inout/stockOrder";
+import stockOrderDistribution from "./stockOrderDistribution";
+import stockOrderQRCodeDetail from "./stockOrderQRCodeDetail";
+import stockQRCodeExport from "./stockQRCodeExport";
+import draggable from "vuedraggable";
+import {inspectionStockOrderPDFFromTemplateFile, stockOrderPDFFromTemplateFile} from "@/api/itextpdf/itextpdf";
+import store from "@/store";
+import {getLocalJoinBusType} from "@/api/basic/busLocalType";
+import {filterAll, filterAllByUser} from "@/api/system/invWarehouse";
+import {filterSubByInv, findInvByUser} from '@/api/system/invSubWarehouse'
+import {convertDate} from "@/utils/date"
+import { filterOrder, orderDetailAdd } from '@/api/inout/order'
+import {getLocalJoinByUser} from "@/api/basic/busType";
+
+export default {
+  name: "stockOrder",
+  props: {
+    data: {
+      type: Object,
+      required: true,
+    },
+    closeDialog: {
+      type: Function,
+      required: true,
+    },
+    purType: {
+      type: Object,
+      required: true,
+    },
+    pId: {
+      type: Object,
+      required: true,
+    },
+    billNo: {
+      type: Object,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      showSearch: true,
+      convertDateFun: convertDate,
+      query: {
+        billType: null,
+        corpName: null,
+        locStorageCode: this.$store.getters.locInvCode,
+        invWarehouseCode: this.$store.getters.locSubInvCode,
+        billNo: "",
+        status: "",
+        action: null,
+        statusType: "supInCode",
+        page: 1,
+        limit: 10,
+        startTime: "",
+        endTime: "",
+        inCodeStatus: 1,
+      },
+      detailQuery: {
+        orderIdFk: "",
+        page: 1,
+        limit: 20
+      },
+      isSp: store.getters.customerId,
+      storageList: [],
+      subInvList: [],
+      busTypes: [],
+      list: [],
+      orderQuery:[],
+      detailList: [],
+      total: 0,
+      detailTotal: 0,
+      loading: false,
+      detailLoading: false,
+      enableMap: {
+        1: "已打印",
+        0: "未打印",
+      },
+      sourceMap: {
+        "1": "UDIMS平台",
+        "2": "网页新增",
+        "3": "pda已校验",
+        "4": "pda未校验",
+        "5": "pc端扫码精灵",
+        "6": "单据流转",
+        "7": "供应商平台",
+        "8": "平衡补单",
+        "9": "单据验收直接补单",
+        "10": "单据复制",
+        "11": "盘点单据转单",
+        "12": "申购计划转单",
+        "13": "领用单据转单",
+        "14": "第三方单据转单",
+
+      },
+      idQuery: {
+        id: "",
+        filterUDIType: null,
+      },
+      distributionVisible: false,
+      detailFormRules: {
+        batchNo: [
+          {required: true, message: "请输入批次号", trigger: "blur"}
+        ],
+        productDate: [
+          {required: true, message: "请输入生产日期", trigger: "blur"}
+        ],
+        expireDate: [
+          {required: true, message: "请输入失效日期", trigger: "blur"}
+        ],
+        sweepCount: [
+          {required: true, message: "请输入扫码数量", trigger: "blur"}
+        ]
+      },
+      detailFormVisible: false,
+      detailFormData: {},
+      detailFormLoading: false,
+      haveDistributionVisible: true,
+      qrcodeDetailVisible: false,
+      qrcodeExportVisible: false,
+      filterUDIType: true,
+      actDateRange: [],
+      auditDateRange: [],
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+        ],
+      },
+    }
+  },
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: ""
+      });
+      this.query = {
+        billType: null,
+        corpName: null,
+        locStorageCode: this.$store.getters.locInvCode,
+        invWarehouseCode: this.$store.getters.locSubInvCode,
+        billNo: "",
+        status: "",
+        action: null,
+        statusType: "supInCode",
+        page: 1,
+        limit: 10,
+        startTime: "",
+        endTime: "",
+        inCodeStatus: 1,
+      };
+      this.getList();
+
+      this.haveDistributionVisible = true;
+      this.actDateRange = [];
+    },
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+    onSubmit() {
+      this.query.page = 1;
+      if (this.actDateRange !== null) {
+        this.query.startTime = this.actDateRange[0];
+        this.query.endTime = this.actDateRange[1];
+      } else {
+        this.query.startTime = null;
+        this.query.endTime = null;
+      }
+
+      if (this.auditDateRange !== null) {
+        this.query.startAduditTime = this.auditDateRange[0];
+        this.query.endAduditTime = this.auditDateRange[1];
+      } else {
+        this.query.startAduditTime = null;
+        this.query.endAduditTime = null;
+      }
+      this.getList();
+      this.haveDistributionVisible = true;
+    },
+    handleCurrentChange(val) {
+      this.query.page = val.page;
+      this.getList();
+    },
+    detailHandleCurrentChange(val) {
+      this.detailQuery.page = val.page;
+      this.getStockOrderDetailList();
+    },
+    // 刷新表单
+    resetForm() {
+      if (this.$refs["dataForm"]) {
+        // 清空验证信息表单
+        this.$refs["dataForm"].clearValidate();
+        // 刷新表单
+        this.$refs["dataForm"].resetFields();
+        this.getList();
+      }
+    },
+    getList() {
+      this.loading = true;
+      this.orderQuery=[];
+      this.query.corpId = store.getters.customerId;
+      if (this.actDateRange !== null) {
+        this.query.startTime = this.actDateRange[0];
+        this.query.endTime = this.actDateRange[1];
+      } else {
+        this.query.startTime = null;
+        this.query.endTime = null;
+      }
+      this.query.vueType = "supDelivery";
+      filterOrder(this.query)
+        .then(response => {
+          this.loading = false;
+          if (response.code == 20000) {
+            this.list = response.data.list || [];
+            this.total = response.data.total || 0;
+            this.detailList = [];
+          } else {
+            this.$message.error(response.message);
+          }
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+          this.detailList = [];
+          this.total = 0;
+        });
+    },
+
+    combine(){
+      if(this.orderQuery==null && this.orderQuery.length==0){
+        this.$message.error("请先选择单据！")
+        return;
+      }
+      var query={
+        orderIdFk:this.billNo,
+        billNo:this.orderQuery.billNo
+      }
+      orderDetailAdd(query).then(response =>{
+          if (response.code == 20000) {
+            this.closeDialog();
+          }
+      })
+    },
+
+    qrcodeDetail(row) {
+      this.idQuery.id = '';
+      if (this.$isNotBlank(row.id)) {
+        this.idQuery.id = row.id;
+        this.idQuery.formData = row;
+        this.idQuery.filterUDIType = this.filterUDIType;
+        this.qrcodeDetailVisible = true;
+      }
+    },
+    closeQRCodeDetailDialog() {
+      this.qrcodeDetailVisible = false;
+      this.getList();
+    },
+    getStockOrderDetailList(row) {
+      if (this.$isNotBlank(row)) {
+        this.detailQuery.orderIdFk = row.billNo;
+        this.orderQuery=row;
+      }
+      this.detailLoading = true;
+      stockOrderDetail(this.detailQuery)
+        .then((response) => {
+          this.detailLoading = false;
+          this.detailList = response.data.list || [];
+          this.detailTotal = response.data.total;
+        })
+        .catch(() => {
+          this.detailLoading = false;
+          this.detailList = [];
+        });
+    },
+    getBusType() {
+      let query = {
+        enabled: true,
+        vueType: "supDelivery",
+      };
+      getLocalJoinByUser(query)
+        .then((response) => {
+          this.busTypes = response.data.list || [];
+          this.filterQuery.action = this.busTypes[0].action;
+          // this.getList();
+        })
+        .catch(() => {
+        });
+    },
+    getSubInvList() {
+      findInvByUser()
+        .then((response) => {
+          this.subInvList = response.data || [];
+        })
+        .catch(() => {
+        });
+    },
+
+    subInvChange() {
+      this.getBusType();
+    },
+  },
+  components: {
+    draggable,
+    stockOrderDistribution,
+    stockOrderQRCodeDetail,
+    stockQRCodeExport,
+  },
+  filters: {
+    statusFilterType(status) {
+      const statusMap = {
+        0: "gray",
+        1: "success"
+      };
+      return statusMap[status];
+    },
+    statusFilterName(status) {
+      const statusMap = {
+        "1": "草稿",
+        "2": "未配货",
+        "3": "待校验",
+      };
+      return statusMap[status];
+    },
+    typeFilterName(type) {
+      const typeMap = {
+        1: "预入库",
+        2: "普通采购",
+      };
+      return typeMap[type];
+    }
+  },
+  created() {
+    // 加载表格数据
+    this.getSubInvList();
+    this.getBusType();
+    this.getList();
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/basic/business/stockOrderQRCodeDetail.vue b/src/views/basic/business/stockOrderQRCodeDetail.vue
index 924d8695..55c54af0 100644
--- a/src/views/basic/business/stockOrderQRCodeDetail.vue
+++ b/src/views/basic/business/stockOrderQRCodeDetail.vue
@@ -1,145 +1,153 @@
 <template>
-    <div>
-
-        <el-form :model="formData" :rules="formRules" ref="dataForm" label-width="100px">
-          <el-row type="flex" justify="end">
-            <el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px;margin-top: -10px">
-              <el-button type="primary" @click.native="generateQRCodeText()" :loading="loading">生成内部码</el-button>
-              <el-button type="primary" @click.native="printStockOrderDetailPDF()" :loading="loading">打印全部</el-button>
-              <el-switch style="margin-left: 50px;" v-model="filterUDIType" active-text="过滤已有UDI码的产品"></el-switch>
-            </el-button-group>
-          </el-row>
-            <el-row>
-                <el-col :span="11">
-                    <el-form-item label="单据号" prop="billNo">
-                        <el-input v-model="formData.billNo" style="width: 90%" auto-complete="off" :disabled="true"></el-input>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="11">
-                    <el-form-item label="单据日期" prop="billdate">
-                        <el-input v-model="formData.createTime" style="width: 90%" auto-complete="off" :disabled="true"></el-input>
-                    </el-form-item>
-                </el-col>
-            </el-row>
-
-            <el-row>
-                <el-col :span="11">
-                    <el-form-item label="往来单位" prop="corpName">
-                        <el-input v-model="formData.customerName" style="width: 90%" auto-complete="off" :disabled="true"></el-input>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="11">
-                    <el-form-item label="业务类型" prop="billTypeName">
-                      <el-input v-model="formData.billTypeName" style="width: 90%" auto-complete="off" :disabled="true"></el-input>
-                    </el-form-item>
-                </el-col>
-            </el-row>
-
-
-            <el-table v-loading="loading" :data="codeArray" style="width: 100%;" max-height="350" height="350"
-                    border  ref="multipleTable">
-                <el-table-column label="序号" type="index" width="50"></el-table-column>
-                <el-table-column label="内部码" prop="udiCode"></el-table-column>
-                <el-table-column label="状态">
-                    <template slot-scope="scope">
-                        <span>{{ statusMap[scope.row.status] }}</span>
-                    </template>
-                </el-table-column>
-              <el-table-column label="标签数量">
-                <template slot-scope="scope">
-                  <el-input size="small" v-model="scope.row.count" placeholder="请输入打印标签数量" style="width: 50%"
-                            oninput="value=value.replace(/[^\d]/g,'')"></el-input>
-                  <!--                            <span>{{ scope.row.reCount }}</span>-->
-                </template>
-              </el-table-column>
-                <el-table-column label="时间" prop="create_time" show-overflow-tooltip>
-                    <template slot-scope="scope">
-                        <i class="el-icon-time"></i>
-                        <span>{{ scope.row.updateTime }}</span>
-                    </template>
-                </el-table-column>
-              <el-table-column label="操作"width="150">
-                <template slot-scope="scope">
-                  <el-button
-                    type="text"
-                    size="small"
-                    @click.native="printStockOrderDetailPDF(scope.row)"
-                  >标签打印
-                  </el-button
-                  >
-                </template>
-              </el-table-column>
-            </el-table>
-
-            <div class="block">
-              <pagination
-                v-show="total>0"
-                :total="total"
-                :limit.sync="query.limit"
-                :page.sync="query.page"
-                @pagination="handleCurrentChange"
-              ></pagination>
-            </div>
-        </el-form>
+  <div>
+    <el-card>
+      <el-form :model="formData" :rules="formRules" ref="dataForm" label-width="100px">
+        <el-row type="flex" justify="end">
+          <el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px;">
+            <el-button type="primary" @click.native="generateQRCodeText()" :loading="loading">生成内部码</el-button>
+            <el-button type="primary" @click.native="printStockOrderDetailPDF()" :loading="loading">打印全部</el-button>
+            <el-switch style="margin-left: 50px;" v-model="filterUDIType" active-text="过滤已有UDI码的产品"></el-switch>
+          </el-button-group>
+        </el-row>
+        <el-row>
+          <el-col :span="11">
+            <el-form-item label="单据号" prop="billNo">
+              <el-input v-model="formData.billNo" style="width: 90%" auto-complete="off" :disabled="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="11">
+            <el-form-item label="单据日期" prop="billdate">
+              <el-input v-model="formData.createTime" style="width: 90%" auto-complete="off"
+                        :disabled="true"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="11">
+            <el-form-item label="送货单位" prop="corpName">
+              <el-input v-model="formData.customerName" style="width: 90%" auto-complete="off"
+                        :disabled="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="11">
+            <el-form-item label="业务类型" prop="billTypeName">
+              <el-input v-model="formData.billTypeName" style="width: 90%" auto-complete="off"
+                        :disabled="true"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </el-card>
+    <el-card>
+      <el-table v-loading="loading" :data="codeArray" style="width: 100%;" max-height="350" height="350"
+                border ref="multipleTable">
+        <el-table-column label="序号" type="index" width="50"></el-table-column>
+        <el-table-column label="物资名称" prop="cpmctymc" width="160" show-overflow-tooltip>
+        </el-table-column>
+        <el-table-column label="规格型号" prop="ggxh" width="160" show-overflow-tooltip>
+        </el-table-column>
+        <el-table-column label="批次号" prop="batchNo" width="120" show-overflow-tooltip>
+        </el-table-column>
+        <el-table-column label="内部码" prop="udiCode" width="200" show-overflow-tooltip></el-table-column>
+        <!--        <el-table-column label="状态" width="100">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            <span>{{ statusMap[scope.row.status] }}</span>-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <el-table-column label="标签数量" width="120">
+          <template slot-scope="scope">
+            <el-input size="small" v-model="scope.row.count" placeholder="请输入打印标签数量" style="width: 50%"
+                      oninput="value=value.replace(/[^\d]/g,'')"></el-input>
+            <!--                            <span>{{ scope.row.reCount }}</span>-->
+          </template>
+        </el-table-column>
+        <!--        <el-table-column label="时间" prop="create_time" show-overflow-tooltip width="150">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            <i class="el-icon-time"></i>-->
+        <!--            <span>{{ scope.row.updateTime }}</span>-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <el-table-column label="操作" width="150">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              @click.native="printStockOrderDetailPDF(scope.row)"
+            >标签打印
+            </el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="block">
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :limit.sync="query.limit"
+          :page.sync="query.page"
+          @pagination="handleCurrentChange"
+        ></pagination>
+      </div>
+    </el-card>
 
 
-      <el-dialog
-        title="标签打印文件列表"
-        :visible.sync="labelPrintVisible"
-        width="60%"
-        :close-on-click-modal="false"
-        :close-on-press-escape="false"
-        append-to-body
-        v-if="labelPrintVisible"
-      >
-        <el-button-group style="display: flex">
-          <el-button
-            type="primary"
-            @click.native="refeshLabel()"
-            style="margin: -50px 60px 10px auto; height: 35px"
-          >刷新
-          </el-button
-          >
-        </el-button-group>
-        <el-table :data="lableFileLsit" style="width: 100%" border>
-          <el-table-column label="序号" type="index"></el-table-column>
-          <el-table-column
-            label="文件名称"
-            prop="fileName"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            label="生成状态"
-            prop="status"
-            show-overflow-tooltip
-          >
-            <template slot-scope="scope">
+    <el-dialog
+      title="标签打印文件列表"
+      :visible.sync="labelPrintVisible"
+      width="60%"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      append-to-body
+      v-if="labelPrintVisible"
+    >
+      <el-button-group style="display: flex">
+        <el-button
+          type="primary"
+          @click.native="refeshLabel()"
+          style="margin: -50px 60px 10px auto; height: 35px"
+        >刷新
+        </el-button
+        >
+      </el-button-group>
+      <el-table :data="lableFileLsit" style="width: 100%" border>
+        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column
+          label="文件名称"
+          prop="fileName"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          label="生成状态"
+          prop="status"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
 
-              <el-tag :type="(scope.row.status) | statusFilterType">
-                {{ printMap[scope.row.status] }}
-              </el-tag>
+            <el-tag :type="(scope.row.status) | statusFilterType">
+              {{ printMap[scope.row.status] }}
+            </el-tag>
 
-            </template>
+          </template>
 
-          </el-table-column>
+        </el-table-column>
 
-          <el-table-column label="操作">
-            <template slot-scope="scope">
-              <el-button type="text" size="small" @click="printLabel(scope.row)">标签打印</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
+        <el-table-column label="操作">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="printLabel(scope.row)">标签打印</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
 
-        <pagination
-          v-show="labltotal>0"
-          :total="labltotal"
-          :limit.sync="refreshQuery.limit"
-          :page.sync="refreshQuery.page"
-          @pagination="handleLableChange"
-        ></pagination>
-      </el-dialog>
+      <pagination
+        v-show="labltotal>0"
+        :total="labltotal"
+        :limit.sync="refreshQuery.limit"
+        :page.sync="refreshQuery.page"
+        @pagination="handleLableChange"
+      ></pagination>
+    </el-dialog>
 
-    </div>
+  </div>
 </template>
 
 <script>
@@ -155,286 +163,288 @@ import {
 import {generateInCodeQRCodeText, generateInnerQRCodeText} from "@/api/inout/innerOrderQRCode";
 
 export default {
-    name: "idQuery",
-    props: {
-        closeDialog: {
-            type: Function,
-            required: true,
-        },
-        idQuery: {
-            type: Object,
-            required: true,
-        },
+  name: "idQuery",
+  props: {
+    closeDialog: {
+      type: Function,
+      required: true,
     },
-    data() {
-        return {
-            code: "",
-            BASE_URL: process.env.VUE_APP_BASE_API,
-            query: {
-                sOrderId: null,
-                orderIdFk: "",
-                page: 1,
-                limit: 10,
-            },
-            busTypes: [],
-            formData: {},
-            codeArray: [],
-            total: 0,
-            loading: false,
-            index: null,
-            formLoading: false,
-            formVisible: false,
-            deleteLoading: false,
-            orderNo: null,
-            labelPrintVisible: false,
-            lableFileLsit: [],
-            labltotal: null,
-            refreshQuery: {
-              page: 1,
-              limit: 10,
-              printCodeIdFk: null,
-              stockOrderFk: null,
-            },
-            filterUDIType:false,
-            statusMap: {
-                0: "未打印",
-                1: "已打印",
-            },
-          printMap: {
-            0: "正在生成",
-            1: "已生成",
-            2: "生成失败"
-          },
-        };
+    idQuery: {
+      type: Object,
+      required: true,
     },
-    components: {
-        draggable,
-    },
-    methods: {
-        // 刷新表单
-        resetForm() {
-            if (this.$refs["dataForm"]) {
-                // 清空验证信息表单
-                this.$refs["dataForm"].clearValidate();
-                // 刷新表单
-                this.$refs["dataForm"].resetFields();
-                this.getList();
-            }
-        },
-      printLabel(row) {
-        window.open(this.pdffileUrl + row.fileName, '_blank');
+  },
+  data() {
+    return {
+      code: "",
+      BASE_URL: process.env.VUE_APP_BASE_API,
+      query: {
+        sOrderId: null,
+        orderIdFk: "",
+        page: 1,
+        limit: 10,
       },
-        refeshLabel() {
-          filterTemp(this.refreshQuery).then((response) => {
-            if (response.code == 20000) {
-              this.lableFileLsit = response.data.list;
-              this.labelPrintVisible = true;
-              this.labltotal = response.data.total || 0;
-            }
-          }).catch(() => {
-            this.loading = false;
-          });
-        },
-        handleCurrentChange(val) {
-            this.query.page = val.page;
-            this.getStockQRCodeTextList();
-        },
-        getStockQRCodeTextList() {
-            this.loading = true;
-            filterPrint(this.query) //查找该单号下的所有条码
-                .then((response) => {
-                    console.log(response)
-                    this.codeArray = response.data.list || [];
-                    this.total = response.data.total || 0;
-                    this.loading = false;
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.list = [];
-                    this.total = 0;
-                });
-        },
-      handleLableChange(val) {
-        this.refreshQuery.page = val.page;
-        this.refeshLabel();
-        this.getOrderQRCodeTextList();
+      busTypes: [],
+      formData: {},
+      codeArray: [],
+      total: 0,
+      loading: false,
+      index: null,
+      formLoading: false,
+      formVisible: false,
+      deleteLoading: false,
+      orderNo: null,
+      labelPrintVisible: false,
+      lableFileLsit: [],
+      labltotal: null,
+      refreshQuery: {
+        page: 1,
+        limit: 10,
+        printCodeIdFk: null,
+        stockOrderFk: null,
+      },
+      filterUDIType: false,
+      statusMap: {
+        0: "未打印",
+        1: "已打印",
       },
-      getOrderQRCodeTextList() {
+      printMap: {
+        0: "正在生成",
+        1: "已生成",
+        2: "生成失败"
+      },
+    };
+  },
+  components: {
+    draggable,
+  },
+  methods: {
+    // 刷新表单
+    resetForm() {
+      if (this.$refs["dataForm"]) {
+        // 清空验证信息表单
+        this.$refs["dataForm"].clearValidate();
+        // 刷新表单
+        this.$refs["dataForm"].resetFields();
+        this.getList();
+      }
+    },
+    printLabel(row) {
+      window.open(this.pdffileUrl + row.fileName, '_blank');
+    },
+    refeshLabel() {
+      filterTemp(this.refreshQuery).then((response) => {
+        if (response.code == 20000) {
+          this.lableFileLsit = response.data.list;
+          this.labelPrintVisible = true;
+          this.labltotal = response.data.total || 0;
+        }
+      }).catch(() => {
+        this.loading = false;
+      });
+    },
+    handleCurrentChange(val) {
+      this.query.page = val.page;
+      this.getStockQRCodeTextList();
+    },
+    getStockQRCodeTextList() {
+      this.loading = true;
+      filterPrint(this.query) //查找该单号下的所有条码
+        .then((response) => {
+          console.log(response)
+          this.codeArray = response.data.list || [];
+          this.total = response.data.total || 0;
+          this.loading = false;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
+    },
+    handleLableChange(val) {
+      this.refreshQuery.page = val.page;
+      this.refeshLabel();
+      this.getOrderQRCodeTextList();
+    },
+    getOrderQRCodeTextList() {
+      this.loading = true;
+      filterPrint(this.query) //查找该单号下的所有条码
+        .then((response) => {
+          console.log(response)
+          this.codeArray = response.data.list || [];
+          this.total = response.data.total || 0;
+          this.loading = false;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
+    },
+    generateQRCodeText() {
+      this.$confirm("确定生成内部码?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
         this.loading = true;
-        filterPrint(this.query) //查找该单号下的所有条码
-          .then((response) => {
-            console.log(response)
-            this.codeArray = response.data.list || [];
-            this.total = response.data.total || 0;
+        generateInCodeQRCodeText({orderIdFk: this.formData.billNo, chack: this.filterUDIType})
+          .then(response => {
             this.loading = false;
+            if (response.code === 20000) {
+              this.$message.success("生成成功！");
+              this.getOrderQRCodeTextList();
+              this.detailList = [];
+            } else {
+              this.$message.error(response.message);
+            }
           })
           .catch(() => {
             this.loading = false;
-            this.list = [];
-            this.total = 0;
-          });
-      },
-      generateQRCodeText() {
-        this.$confirm("确定生成内部码?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        }).then(() => {
-          this.loading = true;
-          generateInCodeQRCodeText({orderIdFk:this.formData.billNo,chack:this.filterUDIType})
-            .then(response => {
-              this.loading = false;
-              if (response.code === 20000) {
-                this.$message.success("生成成功！");
-                this.getOrderQRCodeTextList();
-                this.detailList = [];
-              } else {
-                this.$message.error(response.message);
-              }
-            })
-            .catch(() => {
-              this.loading = false;
-            })
-        }).catch(() => {
+          })
+      }).catch(() => {
 
-        });
-      },
-      printStockOrderDetailPDF(row) {
-        let tQuery = {
-          queryId: null,
-          orderId: null,
-          countList: [],
-        };
-        if (row == null) {
-          tQuery.orderId = this.formData.orderIdFk;
-        } else {
-          if (row.reCount <= 0) {
-            return this.$message.error('数量错误');
-          }
-          tQuery.queryId = row.id;
+      });
+    },
+    printStockOrderDetailPDF(row) {
+      let tQuery = {
+        queryId: null,
+        orderId: null,
+        countList: [],
+        labelId:1
+      };
+      if (row == null) {
+        tQuery.orderId = this.formData.billNo;
+      } else {
+        if (row.reCount <= 0) {
+          return this.$message.error('数量错误');
         }
+        tQuery.queryId = row.id;
+      }
 
-        this.loading = true;
-        inspectionStockQRCodeTextPDFFromTemplateFile(tQuery).then((response) => {
-          if (response.code === 20000) {
-            if (row != null) {
-              tQuery.id = row.id;
-              tQuery.rowCount = row.reCount;
+      this.loading = true;
+      inspectionStockQRCodeTextPDFFromTemplateFile(tQuery).then((response) => {
+        if (response.code === 20000) {
+          if (row != null) {
+            tQuery.id = row.id;
+            tQuery.rowCount = row.reCount;
+            let data = {
+              queryId: row.id,
+              rowCount: row.count
+            }
+            tQuery.countList.push(data);
+          } else {
+            for (let i = 0; i < this.codeArray.length; i++) {
               let data = {
-                queryId: row.id,
-                rowCount: row.count
+                queryId: this.codeArray[i].id,
+                rowCount: this.codeArray[i].count
               }
               tQuery.countList.push(data);
-            } else {
-              for (let i = 0; i < this.codeArray.length; i++) {
-                let data = {
-                  queryId: this.codeArray[i].id,
-                  rowCount: this.codeArray[i].count
-                }
-                tQuery.countList.push(data);
-              }
             }
-            let count = 0;
-            for (let i = 0; i < tQuery.countList.length; i++) {
+          }
+          let count = 0;
+          for (let i = 0; i < tQuery.countList.length; i++) {
 
-              count = count + tQuery.countList[i].rowCount;
-              console.log(count);
-            }
+            count = count + tQuery.countList[i].rowCount;
             console.log(count);
-            if (count > 100) {
-              stockQRCodeTextPDFFromTemplateFileMax(tQuery).then((response) => {
-                if (response.code == 20000) {
-                  this.lableFileLsit = response.data.list;
-                  this.labltotal = response.data.total || 0;
-                  this.labelPrintVisible = true;
-                  this.refreshQuery = {
-                    page: 1,
-                    limit: 10,
-                    printCodeIdFk: tQuery.queryId,
-                    stockOrderFk: tQuery.orderId,
-                  }
-                  this.loading = false;
-                  this.$message.warning("打印文件正在生成中，请点击刷新按钮查看进度，请勿关闭按钮重复打印！");
+          }
+          console.log(count);
+          if (count > 100) {
+            stockQRCodeTextPDFFromTemplateFileMax(tQuery).then((response) => {
+              if (response.code == 20000) {
+                this.lableFileLsit = response.data.list;
+                this.labltotal = response.data.total || 0;
+                this.labelPrintVisible = true;
+                this.refreshQuery = {
+                  page: 1,
+                  limit: 10,
+                  printCodeIdFk: tQuery.queryId,
+                  stockOrderFk: tQuery.orderId,
                 }
-              }).catch(() => {
                 this.loading = false;
-              });
+                this.$message.warning("打印文件正在生成中，请点击刷新按钮查看进度，请勿关闭按钮重复打印！");
+              }
+            }).catch(() => {
+              this.loading = false;
+            });
 
-            } else
-              stockQRCodeTextPDFFromTemplateFile(tQuery).then((response) => {
+          } else
+            stockQRCodeTextPDFFromTemplateFile(tQuery).then((response) => {
 
-                //将pdf文件转换为url。
-                const binaryData = [];
-                binaryData.push(response);
-                //获取blob链接。
-                let url = window.URL.createObjectURL(
-                  new Blob(binaryData, {type: "application/pdf"})
-                );
-                this.loading = false;
-                window.open(url);//打开新标签页，预览pdf。
-              }).catch(() => {
-                this.loading = false;
-              });
-          } else {
-            this.loading = false;
-            this.$message.error(response.message);
-          }
-        }).catch(() => {
+              //将pdf文件转换为url。
+              const binaryData = [];
+              binaryData.push(response);
+              //获取blob链接。
+              let url = window.URL.createObjectURL(
+                new Blob(binaryData, {type: "application/pdf"})
+              );
+              this.loading = false;
+              window.open(url);//打开新标签页，预览pdf。
+            }).catch(() => {
+              this.loading = false;
+            });
+        } else {
           this.loading = false;
-        });
-      },
-        getBusType() {
-            let query = {
-                enabled: true,
-            };
-            getLocalJoinBusType(query)
-                .then((response) => {
-                    this.busTypes = response.data.list || [];
-                    this.filterQuery.billAction = this.busTypes[0].action;
-                    // this.getList();
-                })
-                .catch(() => {
-                });
-        },
-    },
-    filters: {
-      statusFilterType(status) {
-        const statusMap = {
-          0: "warning",
-          1: "success",
-          2: "danger"
-        };
-        return statusMap[status];
-      }},
-    mounted() {
-        document.body.ondrop = function (event) {
-            event.preventDefault();
-            event.stopPropagation();
-        };
-    },
-    created() {
-        // this.getBusType();
-        this.pdffileUrl = this.BASE_URL + "/spms/donwload/pdf?fileName=";
-        this.formData = {};
-        this.codeArray = [];
-        if (this.$isNotBlank(this.idQuery.id)) {
-            this.formData = this.idQuery.formData;
-            this.query.orderIdFk=this.formData.billNo;
-            this.query.sOrderId = this.formData.orderIdFk;
-            this.getStockQRCodeTextList();
+          this.$message.error(response.message);
         }
+      }).catch(() => {
+        this.loading = false;
+      });
+    },
+    getBusType() {
+      let query = {
+        enabled: true,
+      };
+      getLocalJoinBusType(query)
+        .then((response) => {
+          this.busTypes = response.data.list || [];
+          this.filterQuery.billAction = this.busTypes[0].action;
+          // this.getList();
+        })
+        .catch(() => {
+        });
     },
+  },
+  filters: {
+    statusFilterType(status) {
+      const statusMap = {
+        0: "warning",
+        1: "success",
+        2: "danger"
+      };
+      return statusMap[status];
+    }
+  },
+  mounted() {
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+  },
+  created() {
+    // this.getBusType();
+    this.pdffileUrl = this.BASE_URL + "/spms/donwload/pdf?fileName=";
+    this.formData = {};
+    this.codeArray = [];
+    if (this.$isNotBlank(this.idQuery.id)) {
+      this.formData = this.idQuery.formData;
+      this.query.orderIdFk = this.formData.billNo;
+      this.query.sOrderId = this.formData.orderIdFk;
+      this.getStockQRCodeTextList();
+    }
+  },
 };
 </script>
 <style>
 
 .ao-text {
-    width: 100%;
-    font-size: 13px;
-    font-family: "Microsoft YaHei";
-    float: right;
-    text-align: right;
-    margin-top: 10px;
+  width: 100%;
+  font-size: 13px;
+  font-family: "Microsoft YaHei";
+  float: right;
+  text-align: right;
+  margin-top: 10px;
 }
 
 </style>
diff --git a/src/views/basic/business/stockQRCodeExport.vue b/src/views/basic/business/stockQRCodeExport.vue
index 3f29eb54..71bc2ea4 100644
--- a/src/views/basic/business/stockQRCodeExport.vue
+++ b/src/views/basic/business/stockQRCodeExport.vue
@@ -1,481 +1,481 @@
 <template>
-    <div>
-
-        <el-form :model="formData" :rules="formRules" ref="dataForm">
-            <el-button-group style="display: flex">
-                <el-button
-                    type="primary"
-                    @click.native="printStockOrderDetailPDF()"
-                    style="margin: -50px 60px 10px auto; height: 35px"
-                    :loading="loading"
-                >打印全部
-                </el-button
-                >
-            </el-button-group>
-
-          <el-row>
-          <el-col :span="11">
-            <el-form-item label="单据号" prop="billNo">
-              <el-input v-model="formData.billNo" auto-complete="off" :disabled="true"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="11">
-            <el-form-item label="单据日期" prop="billdate">
-              <el-input v-model="formData.billdate" auto-complete="off" :disabled="true"></el-input>
-            </el-form-item>
-          </el-col>
-          </el-row>
-
-          <el-row>
-            <el-col :span="11">
-              <el-form-item label="供应商名称" prop="corpName">
-                <el-input v-model="formData.corpName" auto-complete="off" :disabled="true"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="11">
-              <el-form-item label="业务类型" prop="billType">
-                <el-select v-model="formData.billType" placeholder="请选择业务类型" clearable="true" disabled="true">
-                  <el-option
-                    v-for="item in busTypes"
-                    :key="item.localName"
-                    :label="item.localName"
-                    :value="item.localAction">
-                    <span style="float: left">{{ item.localName }}</span>
-                    <!--<span style="float: right; color: #8492a6; font-size: 13px">{{ item.action }}</span>-->
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-
-            <el-table v-loading="loading" :data="codeArray" style="width: 100%;" max-height="350" border height="350" highlight-current-row ref="multipleTable">
-                <el-table-column label="序号" type="index" width="50"></el-table-column>
-                <el-table-column label="码" prop="udiCode"></el-table-column>
-                <el-table-column label="状态" width="120">
-                    <template slot-scope="scope">
-                        <span>{{ statusMap[scope.row.printStatus] }}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column label="时间" width="200" prop="create_time" show-overflow-tooltip>
-                    <template slot-scope="scope">
-                        <i class="el-icon-time"></i>
-                        <span>{{ scope.row.updateTime }}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column label="标签数量">
-                    <template slot-scope="scope">
-                        <el-input size="small" v-model="scope.row.count" placeholder="请输入打印标签数量" style="width: 50%"
-                                  oninput="value=value.replace(/[^\d]/g,'')"></el-input>
-                        <!--                            <span>{{ scope.row.reCount }}</span>-->
-                    </template>
-                </el-table-column>
-                <el-table-column label="操作" fixed="right" width="150">
-                    <template slot-scope="scope">
-                        <el-button
-                            type="text"
-                            size="small"
-                            @click.native="printStockOrderDetailPDF(scope.row)"
-                        >标签打印
-                        </el-button
-                        >
-                    </template>
-                </el-table-column>
-            </el-table>
-
-
-            <div class="block">
-              <pagination
-                v-show="total>0"
-                :total="total"
-                :limit.sync="query.limit"
-                :page.sync="query.page"
-                @pagination="handleCurrentChange"
-              ></pagination>
-            </div>
-        </el-form>
-        <el-dialog
-            title="标签打印文件列表"
-            :visible.sync="labelPrintVisible"
-            width="60%"
-            :close-on-click-modal="false"
-            :close-on-press-escape="false"
-            append-to-body
-            v-if="labelPrintVisible"
+  <div>
+
+    <el-form :model="formData" :rules="formRules" ref="dataForm">
+      <el-button-group style="display: flex">
+        <el-button
+          type="primary"
+          @click.native="printStockOrderDetailPDF()"
+          style="margin: -50px 60px 10px auto; height: 35px"
+          :loading="loading"
+        >打印全部
+        </el-button
         >
-            <el-button-group style="display: flex">
-                <el-button
-                    type="primary"
-                    @click.native="refeshLabel()"
-                    style="margin: -50px 60px 10px auto; height: 35px"
-                >刷新
-                </el-button
-                >
-            </el-button-group>
-            <el-table :data="lableFileLsit" style="width: 100%">
-                <el-table-column label="序号" type="index"></el-table-column>
-                <el-table-column
-                    label="文件名称"
-                    prop="fileName"
-                    show-overflow-tooltip
-                ></el-table-column>
-                <el-table-column
-                    label="生成状态"
-                    prop="status"
-                    show-overflow-tooltip
-                >
-                    <template slot-scope="scope">
-                        <span>{{ printMap[scope.row.status] }}</span>
-                    </template>
-
-                </el-table-column>
-
-                <el-table-column label="操作" fixed="right">
-                    <template slot-scope="scope">
-                        <el-button
-                            type="text"
-                            size="small"
-                            @click="printLabel(scope.row)"
-                        >标签打印
-                        </el-button
-                        >
-                    </template>
-                </el-table-column>
-            </el-table>
-
-            <el-pagination
-                :page-size="refreshQuery.limit"
-                @current-change="handleLableChange"
-                layout="prev, pager, next"
-                :total="labltotal"
-                :current-page="refreshQuery.page"
+      </el-button-group>
+
+      <el-row>
+        <el-col :span="11">
+          <el-form-item label="单据号" prop="billNo">
+            <el-input v-model="formData.billNo" auto-complete="off" :disabled="true"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="11">
+          <el-form-item label="单据日期" prop="billdate">
+            <el-input v-model="formData.billdate" auto-complete="off" :disabled="true"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row>
+        <el-col :span="11">
+          <el-form-item label="供应商名称" prop="corpName">
+            <el-input v-model="formData.corpName" auto-complete="off" :disabled="true"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="11">
+          <el-form-item label="业务类型" prop="billType">
+            <el-select v-model="formData.billType" placeholder="请选择业务类型" clearable="true" disabled="true">
+              <el-option
+                v-for="item in busTypes"
+                :key="item.localName"
+                :label="item.localName"
+                :value="item.localAction">
+                <span style="float: left">{{ item.localName }}</span>
+                <!--<span style="float: right; color: #8492a6; font-size: 13px">{{ item.action }}</span>-->
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+
+      <el-table v-loading="loading" :data="codeArray" style="width: 100%;" max-height="350" border height="350" highlight-current-row ref="multipleTable">
+        <el-table-column label="序号" type="index" width="50"></el-table-column>
+        <el-table-column label="码" prop="udiCode"></el-table-column>
+        <el-table-column label="状态" width="120">
+          <template slot-scope="scope">
+            <span>{{ statusMap[scope.row.printStatus] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="时间" width="200" prop="create_time" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <i class="el-icon-time"></i>
+            <span>{{ scope.row.updateTime }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="标签数量">
+          <template slot-scope="scope">
+            <el-input size="small" v-model="scope.row.count" placeholder="请输入打印标签数量" style="width: 50%"
+                      oninput="value=value.replace(/[^\d]/g,'')"></el-input>
+            <!--                            <span>{{ scope.row.reCount }}</span>-->
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" width="150">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              @click.native="printStockOrderDetailPDF(scope.row)"
+            >标签打印
+            </el-button
             >
-            </el-pagination>
-        </el-dialog>
-    </div>
+          </template>
+        </el-table-column>
+      </el-table>
+
+
+      <div class="block">
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :limit.sync="query.limit"
+          :page.sync="query.page"
+          @pagination="handleCurrentChange"
+        ></pagination>
+      </div>
+    </el-form>
+    <el-dialog
+      title="标签打印文件列表"
+      :visible.sync="labelPrintVisible"
+      width="60%"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      append-to-body
+      v-if="labelPrintVisible"
+    >
+      <el-button-group style="display: flex">
+        <el-button
+          type="primary"
+          @click.native="refeshLabel()"
+          style="margin: -50px 60px 10px auto; height: 35px"
+        >刷新
+        </el-button
+        >
+      </el-button-group>
+      <el-table :data="lableFileLsit" style="width: 100%">
+        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column
+          label="文件名称"
+          prop="fileName"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          label="生成状态"
+          prop="status"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            <span>{{ printMap[scope.row.status] }}</span>
+          </template>
+
+        </el-table-column>
+
+        <el-table-column label="操作" fixed="right">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              @click="printLabel(scope.row)"
+            >标签打印
+            </el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <el-pagination
+        :page-size="refreshQuery.limit"
+        @current-change="handleLableChange"
+        layout="prev, pager, next"
+        :total="labltotal"
+        :current-page="refreshQuery.page"
+      >
+      </el-pagination>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
 import {
-    stockOrderDetail,
-    submitStockOrder,
-    submitStockOrderError,
-    uploadStockOrderDetailCount,
+  stockOrderDetail,
+  submitStockOrder,
+  submitStockOrderError,
+  uploadStockOrderDetailCount,
 } from "@/api/inout/stockOrder";
 import {stockQRCodeText, filterPrint} from "@/api/inout/stockQRCode";
 import draggable from "vuedraggable";
 import {
-    inspectionOrderDetailPDFFromTemplateFile, filterTemp,
-    inspectionStockQRCodeTextPDFFromTemplateFile,
-    orderDetailPDFFromTemplateFile, stockQRCodeTextPDFFromTemplateFile, stockQRCodeTextPDFFromTemplateFileMax
+  inspectionOrderDetailPDFFromTemplateFile, filterTemp,
+  inspectionStockQRCodeTextPDFFromTemplateFile,
+  orderDetailPDFFromTemplateFile, stockQRCodeTextPDFFromTemplateFile, stockQRCodeTextPDFFromTemplateFileMax
 } from "@/api/itextpdf/itextpdf";
 import {getLocalJoinBusType} from "@/api/basic/busLocalType";
 
 
 export default {
-    name: "idQuery",
-    props: {
-        closeDialog: {
-            type: Function,
-            required: true,
-        },
-        idQuery: {
-            type: Object,
-            required: true,
-        },
+  name: "idQuery",
+  props: {
+    closeDialog: {
+      type: Function,
+      required: true,
     },
-    data() {
-        return {
-            code: "",
-            query: {
-                sOrderId: null,
-                orderIdFk: "",
-                page: 1,
-                limit: 10,
-            },
-            labelPrintVisible: false,
-            busTypes: [],
-            formData: {},
-            codeArray: [],
-            total: 0,
-            lableFileLsit: [],
-            loading: false,
-            index: null,
-            formLoading: false,
-            formVisible: false,
-            deleteLoading: false,
-            orderNo: null,
-            statusMap: {
-                0: "未打印",
-                1: "已打印",
-            },
-            refreshQuery: {
-                page: 1,
-                limit: 10,
-                printCodeIdFk: null,
-                stockOrderFk: null,
-            },
-            labltotal: null,
-            printMap: {
-                0: "正在生成",
-                1: "已生成",
-            },
-            pdffileUrl: null,
-        };
+    idQuery: {
+      type: Object,
+      required: true,
     },
-    components: {
-        draggable,
-    },
-    methods: {
-        submit(formName) {
-            if (this.total < 1) {
-                this.$message.error('未选择条码');
-                return;
+  },
+  data() {
+    return {
+      code: "",
+      query: {
+        sOrderId: null,
+        orderIdFk: "",
+        page: 1,
+        limit: 10,
+      },
+      labelPrintVisible: false,
+      busTypes: [],
+      formData: {},
+      codeArray: [],
+      total: 0,
+      lableFileLsit: [],
+      loading: false,
+      index: null,
+      formLoading: false,
+      formVisible: false,
+      deleteLoading: false,
+      orderNo: null,
+      statusMap: {
+        0: "未打印",
+        1: "已打印",
+      },
+      refreshQuery: {
+        page: 1,
+        limit: 10,
+        printCodeIdFk: null,
+        stockOrderFk: null,
+      },
+      labltotal: null,
+      printMap: {
+        0: "正在生成",
+        1: "已生成",
+      },
+      pdffileUrl: null,
+    };
+  },
+  components: {
+    draggable,
+  },
+  methods: {
+    submit(formName) {
+      if (this.total < 1) {
+        this.$message.error('未选择条码');
+        return;
+      }
+      this.$confirm("是否提交？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        let tQuery = {
+          id: this.idQuery.id
+        }
+        this.loading = true;
+        submitStockOrder(tQuery)
+          .then((response) => {
+            this.loading = false;
+            if (response.code === 20000) {
+              this.$message.success("提交成功");
+              this.closeDialog(true);
+            } else {
+              this.$message.error(response.message);
             }
-            this.$confirm("是否提交？", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            }).then(() => {
-                let tQuery = {
-                    id: this.idQuery.id
-                }
-                this.loading = true;
-                submitStockOrder(tQuery)
-                    .then((response) => {
-                        this.loading = false;
-                        if (response.code === 20000) {
-                            this.$message.success("提交成功");
-                            this.closeDialog(true);
-                        } else {
-                            this.$message.error(response.message);
-                        }
-                    });
-            }).catch(() => {
-                this.loading = false;
-            });
-        },
+          });
+      }).catch(() => {
+        this.loading = false;
+      });
+    },
 
-        refeshLabel() {
+    refeshLabel() {
 
-            filterTemp(this.refreshQuery).then((response) => {
-                if (response.code == 20000) {
-                    this.lableFileLsit = response.data.list;
-                    this.labelPrintVisible = true;
-                    this.labltotal = response.data.total || 0;
-                }
-            }).catch(() => {
-                this.loading = false;
-            });
+      filterTemp(this.refreshQuery).then((response) => {
+        if (response.code == 20000) {
+          this.lableFileLsit = response.data.list;
+          this.labelPrintVisible = true;
+          this.labltotal = response.data.total || 0;
+        }
+      }).catch(() => {
+        this.loading = false;
+      });
 
 
-        },
+    },
 
-        printLabel(row) {
-            window.open(this.pdffileUrl + row.fileName, '_blank');
-        },
+    printLabel(row) {
+      window.open(this.pdffileUrl + row.fileName, '_blank');
+    },
 
+    // 刷新表单
+    resetForm() {
+      if (this.$refs["dataForm"]) {
+        // 清空验证信息表单
+        this.$refs["dataForm"].clearValidate();
         // 刷新表单
-        resetForm() {
-            if (this.$refs["dataForm"]) {
-                // 清空验证信息表单
-                this.$refs["dataForm"].clearValidate();
-                // 刷新表单
-                this.$refs["dataForm"].resetFields();
-                this.getList();
+        this.$refs["dataForm"].resetFields();
+        this.getList();
+      }
+    },
+    getInputFocus(event) {
+      event.currentTarget.select();
+    },
+    tableSelection() {
+      this.$refs.multipleTable.clearSelection();
+      this.$refs.multipleTable.toggleAllSelection();
+    },
+    handleSizeChange(val) {
+      this.query.limit = val;
+      // this.getStockOrderDetailList();
+      this.getStockQRCodeTextList();
+    },
+    handleCurrentChange(val) {
+      this.query.page = val.page;
+      // this.getStockOrderDetailList();
+      this.getStockQRCodeTextList();
+    },
+
+
+    handleLableChange(val) {
+      this.refreshQuery.page = val;
+      this.refeshLabel();
+    },
+
+
+    getStockOrderDetailList() {
+      this.loading = true;
+      filterPrint(this.query) //查找该单号下的所有条码
+        .then((response) => {
+          console.log(response)
+          this.codeArray = response.data.list || [];
+          this.total = response.data.total || 0;
+          this.loading = false;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
+    },
+    getBusType() {
+      let query = {
+        enabled: true,
+      };
+      getLocalJoinBusType(query)
+        .then((response) => {
+          this.busTypes = response.data.list || [];
+        })
+        .catch(() => {
+        });
+    },
+    getStockQRCodeTextList() {
+      this.loading = true;
+      filterPrint(this.query) //查找该单号下的所有条码
+        .then((response) => {
+          console.log(response)
+          this.codeArray = response.data.list || [];
+          this.total = response.data.total || 0;
+          this.loading = false;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
+    },
+    printStockOrderDetailPDF(row) {
+      let tQuery = {
+        queryId: null,
+        orderId: null,
+        countList: [],
+      };
+      if (row == null) {
+        tQuery.orderId = this.query.sOrderId;
+      } else {
+        if (row.reCount <= 0) {
+          return this.$message.error('数量错误');
+        }
+        tQuery.queryId = row.id;
+      }
+
+      this.loading = true;
+      inspectionStockQRCodeTextPDFFromTemplateFile(tQuery).then((response) => {
+        if (response.code === 20000) {
+          if (row != null) {
+            tQuery.id = row.id;
+            tQuery.rowCount = row.reCount;
+            let data = {
+              queryId: row.id,
+              rowCount: row.count
             }
-        },
-        getInputFocus(event) {
-            event.currentTarget.select();
-        },
-        tableSelection() {
-            this.$refs.multipleTable.clearSelection();
-            this.$refs.multipleTable.toggleAllSelection();
-        },
-        handleSizeChange(val) {
-            this.query.limit = val;
-            // this.getStockOrderDetailList();
-            this.getStockQRCodeTextList();
-        },
-        handleCurrentChange(val) {
-            this.query.page = val.page;
-            // this.getStockOrderDetailList();
-            this.getStockQRCodeTextList();
-        },
-
-
-        handleLableChange(val) {
-            this.refreshQuery.page = val;
-            this.refeshLabel();
-        },
-
-
-        getStockOrderDetailList() {
-            this.loading = true;
-            filterPrint(this.query) //查找该单号下的所有条码
-                .then((response) => {
-                    console.log(response)
-                    this.codeArray = response.data.list || [];
-                    this.total = response.data.total || 0;
-                    this.loading = false;
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.list = [];
-                    this.total = 0;
-                });
-        },
-        getBusType() {
-            let query = {
-                enabled: true,
-            };
-            getLocalJoinBusType(query)
-                .then((response) => {
-                    this.busTypes = response.data.list || [];
-                })
-                .catch(() => {
-                });
-        },
-        getStockQRCodeTextList() {
-            this.loading = true;
-            filterPrint(this.query) //查找该单号下的所有条码
-                .then((response) => {
-                    console.log(response)
-                    this.codeArray = response.data.list || [];
-                    this.total = response.data.total || 0;
-                    this.loading = false;
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.list = [];
-                    this.total = 0;
-                });
-        },
-        printStockOrderDetailPDF(row) {
-            let tQuery = {
-                queryId: null,
-                orderId: null,
-                countList: [],
-            };
-            if (row == null) {
-                tQuery.orderId = this.query.sOrderId;
-            } else {
-                if (row.reCount <= 0) {
-                    return this.$message.error('数量错误');
-                }
-                tQuery.queryId = row.id;
+            tQuery.countList.push(data);
+          } else {
+            for (let i = 0; i < this.codeArray.length; i++) {
+              let data = {
+                queryId: this.codeArray[i].id,
+                rowCount: this.codeArray[i].count
+              }
+              tQuery.countList.push(data);
             }
-
-            this.loading = true;
-            inspectionStockQRCodeTextPDFFromTemplateFile(tQuery).then((response) => {
-                if (response.code === 20000) {
-                    if (row != null) {
-                        tQuery.id = row.id;
-                        tQuery.rowCount = row.reCount;
-                        let data = {
-                            queryId: row.id,
-                            rowCount: row.count
-                        }
-                        tQuery.countList.push(data);
-                    } else {
-                        for (let i = 0; i < this.codeArray.length; i++) {
-                            let data = {
-                                queryId: this.codeArray[i].id,
-                                rowCount: this.codeArray[i].count
-                            }
-                            tQuery.countList.push(data);
-                        }
-                    }
-                    let count = 0;
-                    for (let i = 0; i < tQuery.countList.length; i++) {
-
-                        count = count + tQuery.countList[i].rowCount;
-                        console.log(count);
-                    }
-                    console.log(count);
-                    if (count > 100) {
-                        stockQRCodeTextPDFFromTemplateFileMax(tQuery).then((response) => {
-                            if (response.code == 20000) {
-                                this.lableFileLsit = response.data.list;
-                                this.labltotal = response.data.total || 0;
-                                this.labelPrintVisible = true;
-                                this.refreshQuery = {
-                                    page: 1,
-                                    limit: 10,
-                                    printCodeIdFk: tQuery.queryId,
-                                    stockOrderFk: tQuery.orderId,
-                                }
-                                this.loading = false;
-                                this.$message.warning("打印文件正在生成中，请点击刷新按钮查看进度，请勿关闭按钮重复打印！");
-                            }
-                        }).catch(() => {
-                            this.loading = false;
-                        });
-
-                    } else
-                        stockQRCodeTextPDFFromTemplateFile(tQuery).then((response) => {
-
-                            //将pdf文件转换为url。
-                            const binaryData = [];
-                            binaryData.push(response);
-                            //获取blob链接。
-                            let url = window.URL.createObjectURL(
-                                new Blob(binaryData, {type: "application/pdf"})
-                            );
-                            this.loading = false;
-                            window.open(url);//打开新标签页，预览pdf。
-                        }).catch(() => {
-                            this.loading = false;
-                        });
-                } else {
-                    this.loading = false;
-                    this.$message.error(response.message);
+          }
+          let count = 0;
+          for (let i = 0; i < tQuery.countList.length; i++) {
+
+            count = count + tQuery.countList[i].rowCount;
+            console.log(count);
+          }
+          console.log(count);
+          if (count > 100) {
+            stockQRCodeTextPDFFromTemplateFileMax(tQuery).then((response) => {
+              if (response.code == 20000) {
+                this.lableFileLsit = response.data.list;
+                this.labltotal = response.data.total || 0;
+                this.labelPrintVisible = true;
+                this.refreshQuery = {
+                  page: 1,
+                  limit: 10,
+                  printCodeIdFk: tQuery.queryId,
+                  stockOrderFk: tQuery.orderId,
                 }
-            }).catch(() => {
                 this.loading = false;
+                this.$message.warning("打印文件正在生成中，请点击刷新按钮查看进度，请勿关闭按钮重复打印！");
+              }
+            }).catch(() => {
+              this.loading = false;
             });
-        },
-        intentBack() {
-            this.$router.go(-1);
-        },
-        getPrintList(tQuery) {
 
+          } else
+            stockQRCodeTextPDFFromTemplateFile(tQuery).then((response) => {
+
+              //将pdf文件转换为url。
+              const binaryData = [];
+              binaryData.push(response);
+              //获取blob链接。
+              let url = window.URL.createObjectURL(
+                new Blob(binaryData, {type: "application/pdf"})
+              );
+              this.loading = false;
+              window.open(url);//打开新标签页，预览pdf。
+            }).catch(() => {
+              this.loading = false;
+            });
+        } else {
+          this.loading = false;
+          this.$message.error(response.message);
         }
+      }).catch(() => {
+        this.loading = false;
+      });
     },
-    filters: {},
-    mounted() {
-        document.body.ondrop = function (event) {
-            event.preventDefault();
-            event.stopPropagation();
-        };
-    },
-    created() {
-        this.getBusType();
-        this.formData = {};
-        this.codeArray = [];
-        this.pdffileUrl = BASE_URL + "/spms/donwload/pdf?fileName=";
-        if (this.$isNotBlank(this.idQuery.id)) {
-
-            this.formData = this.idQuery.formData;
-            // this.query.orderIdFk = this.idQuery.id;
-            // this.getStockOrderDetailList();
-            this.query.orderId = this.idQuery.id;
-            this.query.sOrderId = this.idQuery.id;
-            console.log(this.query.sOrderId);
-            this.getStockQRCodeTextList();
-        }
+    intentBack() {
+      this.$router.go(-1);
     },
+    getPrintList(tQuery) {
+
+    }
+  },
+  filters: {},
+  mounted() {
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+  },
+  created() {
+    this.getBusType();
+    this.formData = {};
+    this.codeArray = [];
+    this.pdffileUrl = BASE_URL + "/spms/donwload/pdf?fileName=";
+    if (this.$isNotBlank(this.idQuery.id)) {
+
+      this.formData = this.idQuery.formData;
+      // this.query.orderIdFk = this.idQuery.id;
+      // this.getStockOrderDetailList();
+      this.query.orderId = this.idQuery.id;
+      this.query.sOrderId = this.idQuery.id;
+      console.log(this.query.sOrderId);
+      this.getStockQRCodeTextList();
+    }
+  },
 };
 </script>
 <style>
 
 .ao-text {
-    width: 100%;
-    font-size: 13px;
-    font-family: "Microsoft YaHei";
-    float: right;
-    text-align: right;
-    margin-top: 10px;
+  width: 100%;
+  font-size: 13px;
+  font-family: "Microsoft YaHei";
+  float: right;
+  text-align: right;
+  margin-top: 10px;
 }
 
 </style>
diff --git a/src/views/basic/product/productUdiType.vue b/src/views/basic/product/productUdiType.vue
index 0c52122d..1d1c4a4f 100644
--- a/src/views/basic/product/productUdiType.vue
+++ b/src/views/basic/product/productUdiType.vue
@@ -284,7 +284,6 @@ export default {
 
     /** 查询菜单下拉树结构 */
     getTreeselect(row) {
-      debugger
       if(row!=null){
         var data={
           code:row.code,
diff --git a/src/views/inventory/inner/innerCodeDetail.vue b/src/views/inventory/inner/innerCodeDetail.vue
index 9add767e..51a311bd 100644
--- a/src/views/inventory/inner/innerCodeDetail.vue
+++ b/src/views/inventory/inner/innerCodeDetail.vue
@@ -1,447 +1,449 @@
 <template>
-    <div>
-
-        <el-form :model="formData" :rules="formRules" ref="dataForm">
-            <el-row type="flex" justify="end">
-                <el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px;margin-top: -10px">
-                    <el-button
-                        type="primary"
-                        @click.native="generateQRCodeText()"
-                        :loading="loading"
-                    >生成内部码
-                    </el-button
-                    >
-
-                    <el-button
-                        type="primary"
-                        @click.native="printStockOrderDetailPDF()"
-
-                        :loading="loading"
-                    >打印全部
-                    </el-button
-                    >
-                </el-button-group>
-            </el-row>
-
-
-            <el-row :gutter="20">
-                <el-col :span="3">
-                    <div class="ao-text">
-                        <span>单据号：</span>
-                    </div>
-                </el-col>
-                <el-col :span="7">
-                    <el-form-item prop="billNo">
-                        <el-input v-model="formData.recordKey" auto-complete="off" :disabled="true"></el-input>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="3">
-                    <div class="ao-text">
-                        <span>单据日期：</span>
-                    </div>
-                </el-col>
-                <el-col :span="7">
-                    <el-form-item prop="createTime">
-                        <el-input v-model="formData.createTime" auto-complete="off" :disabled="true"></el-input>
-                    </el-form-item>
-                </el-col>
-            </el-row>
-
-
-            <el-table v-loading="loading" :data="codeArray" style="width: 100%;" max-height="350" height="350"
-                      highlight-current-row
-                      border
-                      ref="multipleTable">
-                <el-table-column label="序号" type="index" width="50"></el-table-column>
-                <el-table-column label="码" prop="udiCode"></el-table-column>
-
-                <el-table-column label="状态" width="120">
-                    <template slot-scope="scope">
-                        <span>{{ statusMap[scope.row.status] }}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column
-                    label="时间"
-                    width="200"
-                    prop="create_time"
-                    show-overflow-tooltip
-                >
-                    <template slot-scope="scope">
-                        <i class="el-icon-time"></i>
-                        <span>{{ scope.row.updateTime }}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column label="标签数量">
-                    <template slot-scope="scope">
-                        <el-input size="small" v-model="scope.row.count" placeholder="请输入打印标签数量" style="width: 50%"
-                                  oninput="value=value.replace(/[^\d]/g,'')"></el-input>
-                        <!--                            <span>{{ scope.row.reCount }}</span>-->
-                    </template>
-                </el-table-column>
-                <el-table-column label="操作"width="150">
-                    <template slot-scope="scope">
-                        <el-button
-                            type="text"
-                            size="small"
-                            @click.native="printStockOrderDetailPDF(scope.row)"
-                        >标签打印
-                        </el-button
-                        >
-                    </template>
-                </el-table-column>
-            </el-table>
-
-
-            <div class="block">
-              <pagination
-                v-show="total>0"
-                :total="total"
-                :limit.sync="query.limit"
-                :page.sync="query.page"
-                @pagination="handleCurrentChange"
-              ></pagination>
-            </div>
-        </el-form>
-        <el-dialog
-            title="标签打印文件列表"
-            :visible.sync="labelPrintVisible"
-            width="60%"
-            :close-on-click-modal="false"
-            :close-on-press-escape="false"
-            append-to-body
-            v-if="labelPrintVisible"
+  <div>
+
+    <el-form :model="formData" :rules="formRules" ref="dataForm">
+      <el-row type="flex" justify="end">
+        <el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px;margin-top: -10px">
+          <el-button
+            type="primary"
+            @click.native="generateQRCodeText()"
+            :loading="loading"
+          >生成内部码
+          </el-button
+          >
+
+          <el-button
+            type="primary"
+            @click.native="printStockOrderDetailPDF()"
+
+            :loading="loading"
+          >打印全部
+          </el-button
+          >
+        </el-button-group>
+      </el-row>
+
+
+      <el-row :gutter="20">
+        <el-col :span="3">
+          <div class="ao-text">
+            <span>单据号：</span>
+          </div>
+        </el-col>
+        <el-col :span="7">
+          <el-form-item prop="billNo">
+            <el-input v-model="formData.recordKey" auto-complete="off" :disabled="true"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="3">
+          <div class="ao-text">
+            <span>单据日期：</span>
+          </div>
+        </el-col>
+        <el-col :span="7">
+          <el-form-item prop="createTime">
+            <el-input v-model="formData.createTime" auto-complete="off" :disabled="true"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+
+      <el-table v-loading="loading" :data="codeArray" style="width: 100%;" max-height="350" height="350"
+                highlight-current-row
+                border
+                ref="multipleTable">
+        <el-table-column label="序号" type="index" width="50"></el-table-column>
+        <el-table-column label="码" prop="udiCode"></el-table-column>
+
+        <el-table-column label="状态" width="120">
+          <template slot-scope="scope">
+            <span>{{ statusMap[scope.row.status] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="时间"
+          width="200"
+          prop="createTime"
+          show-overflow-tooltip
         >
-            <el-button-group style="display: flex">
-                <el-button
-                    type="primary"
-                    @click.native="refeshLabel()"
-                    style="margin: -50px 60px 10px auto; height: 35px"
-                >刷新
-                </el-button
-                >
-            </el-button-group>
-            <el-table :data="lableFileLsit" style="width: 100%" border>
-                <el-table-column label="序号" type="index"></el-table-column>
-                <el-table-column
-                    label="文件名称"
-                    prop="fileName"
-                    show-overflow-tooltip
-                ></el-table-column>
-                <el-table-column
-                    label="生成状态"
-                    prop="status"
-                    show-overflow-tooltip
-                >
-                    <template slot-scope="scope">
-
-                        <el-tag :type="(scope.row.status) | statusFilterType">
-                            {{ printMap[scope.row.status] }}
-                        </el-tag>
-
-                    </template>
-
-                </el-table-column>
-
-                <el-table-column label="操作">
-                    <template slot-scope="scope">
-                        <el-button type="text" size="small" @click="printLabel(scope.row)">标签打印</el-button>
-                    </template>
-                </el-table-column>
-            </el-table>
-
-          <pagination
-            v-show="labltotal>0"
-            :total="labltotal"
-            :limit.sync="refreshQuery.limit"
-            :page.sync="refreshQuery.page"
-            @pagination="handleLableChange"
-          ></pagination>
-        </el-dialog>
-    </div>
+          <template slot-scope="scope">
+            <i class="el-icon-time"></i>
+            <span>{{ scope.row.updateTime }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="标签数量">
+          <template slot-scope="scope">
+            <el-input size="small" v-model="scope.row.count" placeholder="请输入打印标签数量" style="width: 50%"
+                      oninput="value=value.replace(/[^\d]/g,'')"></el-input>
+            <!--                            <span>{{ scope.row.reCount }}</span>-->
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" width="150">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              @click.native="printStockOrderDetailPDF(scope.row)"
+            >标签打印
+            </el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+
+
+      <div class="block">
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :limit.sync="query.limit"
+          :page.sync="query.page"
+          @pagination="handleCurrentChange"
+        ></pagination>
+      </div>
+    </el-form>
+    <el-dialog
+      title="标签打印文件列表"
+      :visible.sync="labelPrintVisible"
+      width="60%"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      append-to-body
+      v-if="labelPrintVisible"
+    >
+      <el-button-group style="display: flex">
+        <el-button
+          type="primary"
+          @click.native="refeshLabel()"
+          style="margin: -50px 60px 10px auto; height: 35px"
+        >刷新
+        </el-button
+        >
+      </el-button-group>
+      <el-table :data="lableFileLsit" style="width: 100%" border>
+        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column
+          label="文件名称"
+          prop="fileName"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          label="生成状态"
+          prop="status"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+
+            <el-tag :type="(scope.row.status) | statusFilterType">
+              {{ printMap[scope.row.status] }}
+            </el-tag>
+
+          </template>
+
+        </el-table-column>
+
+        <el-table-column label="操作">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="printLabel(scope.row)">标签打印</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination
+        v-show="labltotal>0"
+        :total="labltotal"
+        :limit.sync="refreshQuery.limit"
+        :page.sync="refreshQuery.page"
+        @pagination="handleLableChange"
+      ></pagination>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
-import {stockQRCodeText, filterPrint,generateInnerQRCodeText} from "@/api/inout/innerOrderQRCode";
+import {stockQRCodeText, filterPrint, generateInnerQRCodeText} from "@/api/inout/innerOrderQRCode";
 import draggable from "vuedraggable";
-import {filterTemp, inspectionStockQRCodeTextPDFFromTemplateFile,
+import {
+  filterTemp, inspectionStockQRCodeTextPDFFromTemplateFile,
   stockQRCodeTextPDFFromTemplateFile, stockQRCodeTextPDFFromTemplateFileMax
 } from "@/api/itextpdf/itextpdf";
 
 
-
 export default {
-    name: "innerCodeDetail",
-    props: {
-        closeDialog: {
-            type: Function,
-            required: true,
-        },
-        inQuery: {
-            type: Object,
-            required: true,
-        },
+  name: "innerCodeDetail",
+  props: {
+    closeDialog: {
+      type: Function,
+      required: true,
     },
-    data() {
-        return {
-            BASE_URL: process.env.VUE_APP_BASE_API,
-            code: "",
-            query: {
-                sOrderId: null,
-                orderIdFk: "",
-                page: 1,
-                limit: 10,
-                orderId:"",
-            },
-            labelPrintVisible: false,
-            formData: {},
-            codeArray: [],
-            total: 0,
-            lableFileLsit: [],
-            loading: false,
-            index: null,
-            formLoading: false,
-            formVisible: false,
-            deleteLoading: false,
-            orderNo: null,
-            statusMap: {
-                0: "未打印",
-                1: "已打印",
-            },
-            refreshQuery: {
-                page: 1,
-                limit: 10,
-                printCodeIdFk: null,
-                stockOrderFk: null,
-            },
-            labltotal: null,
-            printMap: {
-                0: "正在生成",
-                1: "已生成",
-                2: "生成失败"
-            },
-            pdffileUrl: null,
-        };
+    inQuery: {
+      type: Object,
+      required: true,
     },
-    components: {
-        draggable,
+  },
+  data() {
+    return {
+      BASE_URL: process.env.VUE_APP_BASE_API,
+      code: "",
+      query: {
+        sOrderId: null,
+        orderIdFk: "",
+        page: 1,
+        limit: 10,
+        orderId: "",
+      },
+      labelPrintVisible: false,
+      formData: {},
+      codeArray: [],
+      total: 0,
+      lableFileLsit: [],
+      loading: false,
+      index: null,
+      formLoading: false,
+      formVisible: false,
+      deleteLoading: false,
+      orderNo: null,
+      statusMap: {
+        0: "未打印",
+        1: "已打印",
+      },
+      refreshQuery: {
+        page: 1,
+        limit: 10,
+        printCodeIdFk: null,
+        stockOrderFk: null,
+      },
+      labltotal: null,
+      printMap: {
+        0: "正在生成",
+        1: "已生成",
+        2: "生成失败"
+      },
+      pdffileUrl: null,
+    };
+  },
+  components: {
+    draggable,
+  },
+  methods: {
+
+    refeshLabel() {
+      filterTemp(this.refreshQuery).then((response) => {
+        if (response.code == 20000) {
+          this.lableFileLsit = response.data.list;
+          this.labelPrintVisible = true;
+          this.labltotal = response.data.total || 0;
+        }
+      }).catch(() => {
+        this.loading = false;
+      });
     },
-    methods: {
-
-        refeshLabel() {
-            filterTemp(this.refreshQuery).then((response) => {
-                if (response.code == 20000) {
-                    this.lableFileLsit = response.data.list;
-                    this.labelPrintVisible = true;
-                    this.labltotal = response.data.total || 0;
-                }
-            }).catch(() => {
-                this.loading = false;
-            });
-        },
 
-        printLabel(row) {
-            window.open(this.pdffileUrl + row.fileName, '_blank');
-        },
+    printLabel(row) {
+      window.open(this.pdffileUrl + row.fileName, '_blank');
+    },
 
+    // 刷新表单
+    resetForm() {
+      if (this.$refs["dataForm"]) {
+        // 清空验证信息表单
+        this.$refs["dataForm"].clearValidate();
         // 刷新表单
-        resetForm() {
-            if (this.$refs["dataForm"]) {
-                // 清空验证信息表单
-                this.$refs["dataForm"].clearValidate();
-                // 刷新表单
-                this.$refs["dataForm"].resetFields();
+        this.$refs["dataForm"].resetFields();
+      }
+    },
+    getInputFocus(event) {
+      event.currentTarget.select();
+    },
+    tableSelection() {
+      this.$refs.multipleTable.clearSelection();
+      this.$refs.multipleTable.toggleAllSelection();
+    },
+    handleCurrentChange(val) {
+      this.query.page = val.page;
+      this.getOrderQRCodeTextList();
+    },
+
+
+    handleLableChange(val) {
+      this.refreshQuery.page = val.page;
+      this.refeshLabel();
+      this.getOrderQRCodeTextList();
+    },
+
+    getOrderQRCodeTextList() {
+      this.loading = true;
+      filterPrint({sOrderId :this.query.sOrderId}) //查找该单号下的所有条码
+        .then((response) => {
+          console.log(response)
+          this.codeArray = response.data.list || [];
+          this.total = response.data.total || 0;
+          this.loading = false;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
+    },
+    printStockOrderDetailPDF(row) {
+      let tQuery = {
+        queryId: null,
+        orderId: null,
+        countList: [],
+        labelId:1
+      };
+      if (row == null) {
+        tQuery.orderId = this.query.orderIdFk;
+      } else {
+        if (row.reCount <= 0) {
+          return this.$message.error('数量错误');
+        }
+        tQuery.queryId = row.id;
+      }
+      this.loading = true;
+      inspectionStockQRCodeTextPDFFromTemplateFile(tQuery).then((response) => {
+        if (response.code === 20000) {
+          if (row != null) {
+            tQuery.id = row.id;
+            tQuery.rowCount = row.reCount;
+            let data = {
+              queryId: row.id,
+              rowCount: row.count
             }
-        },
-        getInputFocus(event) {
-            event.currentTarget.select();
-        },
-        tableSelection() {
-            this.$refs.multipleTable.clearSelection();
-            this.$refs.multipleTable.toggleAllSelection();
-        },
-        handleCurrentChange(val) {
-            this.query.page = val.page;
-            this.getOrderQRCodeTextList();
-        },
-
-
-        handleLableChange(val) {
-            this.refreshQuery.page = val.page;
-            this.refeshLabel();
-            this.getOrderQRCodeTextList();
-        },
-
-      getOrderQRCodeTextList() {
-            this.loading = true;
-            filterPrint(this.query) //查找该单号下的所有条码
-                .then((response) => {
-                    console.log(response)
-                    this.codeArray = response.data.list || [];
-                    this.total = response.data.total || 0;
-                    this.loading = false;
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.list = [];
-                    this.total = 0;
-                });
-        },
-        printStockOrderDetailPDF(row) {
-            let tQuery = {
-                queryId: null,
-                orderId: null,
-                countList: [],
-            };
-            if (row == null) {
-                tQuery.orderId = this.formData.id;
-            } else {
-                if (row.reCount <= 0) {
-                    return this.$message.error('数量错误');
-                }
-                tQuery.queryId = row.id;
+            tQuery.countList.push(data);
+          } else {
+            for (let i = 0; i < this.codeArray.length; i++) {
+              let data = {
+                queryId: this.codeArray[i].id,
+                rowCount: this.codeArray[i].count
+              }
+              tQuery.countList.push(data);
             }
-
-            this.loading = true;
-            inspectionStockQRCodeTextPDFFromTemplateFile(tQuery).then((response) => {
-                if (response.code === 20000) {
-                    if (row != null) {
-                        tQuery.id = row.id;
-                        tQuery.rowCount = row.reCount;
-                        let data = {
-                            queryId: row.id,
-                            rowCount: row.count
-                        }
-                        tQuery.countList.push(data);
-                    } else {
-                        for (let i = 0; i < this.codeArray.length; i++) {
-                            let data = {
-                                queryId: this.codeArray[i].id,
-                                rowCount: this.codeArray[i].count
-                            }
-                            tQuery.countList.push(data);
-                        }
-                    }
-                    let count = 0;
-                    for (let i = 0; i < tQuery.countList.length; i++) {
-
-                        count = count + tQuery.countList[i].rowCount;
-                        console.log(count);
-                    }
-                    console.log(count);
-                    if (count > 100) {
-                        stockQRCodeTextPDFFromTemplateFileMax(tQuery).then((response) => {
-                            if (response.code == 20000) {
-                                this.lableFileLsit = response.data.list;
-                                this.labltotal = response.data.total || 0;
-                                this.labelPrintVisible = true;
-                                this.refreshQuery = {
-                                    page: 1,
-                                    limit: 10,
-                                    printCodeIdFk: tQuery.queryId,
-                                    stockOrderFk: tQuery.orderId,
-                                }
-                                this.loading = false;
-                                this.$message.warning("打印文件正在生成中，请点击刷新按钮查看进度，请勿关闭按钮重复打印！");
-                            }
-                        }).catch(() => {
-                            this.loading = false;
-                        });
-
-                    } else
-                        stockQRCodeTextPDFFromTemplateFile(tQuery).then((response) => {
-                            //将pdf文件转换为url。
-                            const binaryData = [];
-                            binaryData.push(response);
-                            //获取blob链接。
-                            let url = window.URL.createObjectURL(
-                                new Blob(binaryData, {type: "application/pdf"})
-                            );
-                            this.loading = false;
-                            window.open(url);//打开新标签页，预览pdf。
-                        }).catch(() => {
-                            this.loading = false;
-                        });
-                } else {
-                    this.loading = false;
-                    this.$message.error(response.message);
+          }
+          let count = 0;
+          for (let i = 0; i < tQuery.countList.length; i++) {
+
+            count = count + tQuery.countList[i].rowCount;
+            console.log(count);
+          }
+          console.log(count);
+          if (count > 100) {
+            stockQRCodeTextPDFFromTemplateFileMax(tQuery).then((response) => {
+              if (response.code == 20000) {
+                this.lableFileLsit = response.data.list;
+                this.labltotal = response.data.total || 0;
+                this.labelPrintVisible = true;
+                this.refreshQuery = {
+                  page: 1,
+                  limit: 10,
+                  printCodeIdFk: tQuery.queryId,
+                  stockOrderFk: tQuery.orderId,
                 }
-            }).catch(() => {
                 this.loading = false;
-            });
-        },
-
-        generateQRCodeText() {
-            this.$confirm("确定生成内部码?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            }).then(() => {
-                this.loading = true;
-                generateInnerQRCodeText({orderIdFk:this.formData.id})
-                    .then(response => {
-                        this.loading = false;
-                        if (response.code === 20000) {
-                            this.$message.success("生成成功！");
-                            this.getOrderQRCodeTextList();
-                            this.detailList = [];
-                        } else {
-                            this.$message.error(response.message);
-                        }
-                    })
-                    .catch(() => {
-                        this.loading = false;
-                    })
+                this.$message.warning("打印文件正在生成中，请点击刷新按钮查看进度，请勿关闭按钮重复打印！");
+              }
             }).catch(() => {
-
+              this.loading = false;
             });
-        },
-
-
-        intentBack() {
-            this.$router.go(-1);
-        },
-        getPrintList(tQuery) {
 
+          } else
+            stockQRCodeTextPDFFromTemplateFile(tQuery).then((response) => {
+              //将pdf文件转换为url。
+              const binaryData = [];
+              binaryData.push(response);
+              //获取blob链接。
+              let url = window.URL.createObjectURL(
+                new Blob(binaryData, {type: "application/pdf"})
+              );
+              this.loading = false;
+              window.open(url);//打开新标签页，预览pdf。
+              this.getOrderQRCodeTextList();
+            }).catch(() => {
+              this.loading = false;
+            });
+        } else {
+          this.loading = false;
+          this.$message.error(response.message);
         }
+      }).catch(() => {
+        this.loading = false;
+      });
     },
-    filters: {
-
-        statusFilterType(status) {
-            const statusMap = {
-                0: "warning",
-                1: "success",
-                2: "danger"
-            };
-            return statusMap[status];
-        }
-        ,
 
+    generateQRCodeText() {
+      this.$confirm("确定生成内部码?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        this.loading = true;
+        generateInnerQRCodeText({orderIdFk: this.formData.recordKey})
+          .then(response => {
+            this.loading = false;
+            if (response.code === 20000) {
+              this.$message.success("生成成功！");
+              this.getOrderQRCodeTextList();
+              this.detailList = [];
+            } else {
+              this.$message.error(response.message);
+            }
+          })
+          .catch(() => {
+            this.loading = false;
+          })
+      }).catch(() => {
+
+      });
     },
-    mounted() {
-    },
-    created() {
-        this.formData = {};
-        this.codeArray = [];
-        this.pdffileUrl = this.BASE_URL + "/spms/donwload/pdf?fileName=";
-        if (this.$isNotBlank(this.inQuery.id)) {
-            this.formData = this.inQuery.formData;
-            this.query.orderId = this.inQuery.id;
-            this.query.orderIdFk = this.formData.id;
-            this.query.sOrderId = this.inQuery.id;
-            this.getOrderQRCodeTextList();
-        }
+
+
+    intentBack() {
+      this.$router.go(-1);
     },
+    getPrintList(tQuery) {
+
+    }
+  },
+  filters: {
+
+    statusFilterType(status) {
+      const statusMap = {
+        0: "warning",
+        1: "success",
+        2: "danger"
+      };
+      return statusMap[status];
+    }
+    ,
+
+  },
+  mounted() {
+  },
+  created() {
+    this.formData = {};
+    this.codeArray = [];
+    this.pdffileUrl = this.BASE_URL + "/spms/donwload/pdf?fileName=";
+    if (this.$isNotBlank(this.inQuery.id)) {
+      this.formData = this.inQuery.formData;
+      this.query.orderId = this.inQuery.id;
+      this.query.orderIdFk = this.formData.recordKey;
+      this.query.sOrderId = this.inQuery.id;
+      console.log(this.query)
+      this.getOrderQRCodeTextList();
+    }
+  },
 };
 </script>
 <style>
 
 .ao-text {
-    width: 100%;
-    font-size: 13px;
-    font-family: "Microsoft YaHei";
-    float: right;
-    text-align: right;
-    margin-top: 10px;
+  width: 100%;
+  font-size: 13px;
+  font-family: "Microsoft YaHei";
+  float: right;
+  text-align: right;
+  margin-top: 10px;
 }
 
 </style>
diff --git a/src/views/inventory/inner/innerOrder.vue b/src/views/inventory/inner/innerOrder.vue
index 194d4e71..b89ef05b 100644
--- a/src/views/inventory/inner/innerOrder.vue
+++ b/src/views/inventory/inner/innerOrder.vue
@@ -1,125 +1,122 @@
 <template>
-    <div>
-        <el-card class="el-card">
-            <el-form  :model="filterQuery" label-width="120px">
-                <el-row>
-                  <el-col :span="6">
-                    <el-form-item label="单据号">
-                        <el-input v-model="filterQuery.recordKey" style="width: 90%" placeholder="请输入单据号" clearable></el-input>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="6">
-                    <el-form-item label="单据日期">
-                        <el-date-picker
-                            style="width: 90%"
-                            :picker-options="pickerOptions"
-                            v-model="actDateRange"
-                            type="daterange"
-                            format="yyyy 年 MM 月 dd 日"
-                            value-format="yyyy-MM-dd"
-                            range-separator="至"
-                            start-placeholder="开始日期"
-                            end-placeholder="结束日期"
-                        >
-                        </el-date-picker>
-                    </el-form-item>
-                  </el-col>
-                    <el-form-item>
-                        <el-button-group style="display:flex;">
-                            <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
-                            <el-button type="primary" icon="search" @click="onSubmitFind">查询</el-button>
-                            <el-button type="primary" icon="search" @click="newDistributionForm()" :loading="loading">
-                                新增打印单
-                            </el-button>
-                        </el-button-group>
+  <div>
+    <el-card class="el-card">
+      <el-form :model="filterQuery" label-width="100px">
+        <el-row>
+          <el-form-item label="单据号">
+            <el-input v-model="filterQuery.recordKey" style="width: 100%" placeholder="请输入单据号" clearable></el-input>
+          </el-form-item>
+          <el-form-item label="单据日期">
+            <el-date-picker
+              style="width: 100%"
+              :picker-options="pickerOptions"
+              v-model="actDateRange"
+              type="daterange"
+              format="yyyy 年 MM 月 dd 日"
+              value-format="yyyy-MM-dd"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+            >
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item>
+            <el-button-group style="display:flex;">
+              <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
+              <el-button type="primary" icon="search" @click="onSubmitFind">查询</el-button>
+              <el-button type="primary" icon="search" @click="newDistributionForm()" :loading="loading">
+                新增打印单
+              </el-button>
+            </el-button-group>
 
-                    </el-form-item>
-                </el-row>
-            </el-form>
-            <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row="true"
-                      @current-change="handleDetail">
-                <el-table-column label="序号" type="index" width="60"></el-table-column>
-                <el-table-column label="单据号" prop="recordKey"></el-table-column>
-                <el-table-column label="创建日期" prop="createTime">
-                    <template slot-scope="scope">
-                        <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column label="创建人" prop="createUser"></el-table-column>
-                <el-table-column label="备注说明" prop="remark"></el-table-column>
-                <el-table-column label="打印状态" prop="printStatus">
-                    <template slot-scope="scope">
-                        <el-tag :type="(scope.row.status) | statusFilterType">
-                            {{ statusPrintMap[scope.row.status] }}
-                        </el-tag>
-                    </template>
-                </el-table-column>
+          </el-form-item>
+        </el-row>
+      </el-form>
+      <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row="true"
+                @current-change="handleDetail">
+        <el-table-column label="序号" type="index" width="60"></el-table-column>
+        <el-table-column label="单据号" prop="recordKey"></el-table-column>
+        <el-table-column label="创建日期" prop="createTime">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="创建人" prop="createByName"></el-table-column>
+        <el-table-column label="备注说明" prop="remark"></el-table-column>
+        <el-table-column label="打印状态" prop="printStatus">
+          <template slot-scope="scope">
+            <el-tag :type="(scope.row.genStatus) | statusFilterType">
+              {{ statusPrintMap[scope.row.genStatus] }}
+            </el-tag>
+          </template>
+        </el-table-column>
 
-                <el-table-column label="操作">
-                    <template slot-scope="scope">
-                        <el-button type="text" size="small" @click.native="newDistributionForm(scope.$index, scope.row)">编辑</el-button>
-                        <el-button type="text" size="small" @click.native="printQRCodeText(scope.row)">打印</el-button>
-                        <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)">删除</el-button>
-                    </template>
-                </el-table-column>
-            </el-table>
+        <el-table-column label="操作">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click.native.stop="newDistributionForm(scope.$index, scope.row)">编辑
+            </el-button>
+            <el-button type="text" size="small" @click.native="printQRCodeText(scope.row)">打印</el-button>
+            <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
 
-          <pagination
-            v-show="total>0"
-            :total="total"
-            :limit.sync="filterQuery.limit"
-            :page.sync="filterQuery.page"
-            @pagination="handleCurrentChange"
-          ></pagination>
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :limit.sync="filterQuery.limit"
+        :page.sync="filterQuery.page"
+        @pagination="handleCurrentChange"
+      ></pagination>
 
-        </el-card>
-        <el-card class="el-card">
-            <el-table v-loading="loading" :data="detailList" style="width: 100%" border highlight-current-row>
-                <el-table-column label="序号" type="index" width="120"></el-table-column>
-                <el-table-column label="物资编码" prop="productId"></el-table-column>
-                <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
-                <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
-                <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>
-                <el-table-column label="计量单位" prop="measname" show-overflow-tooltip="true"></el-table-column>
-                <el-table-column label="批次号" prop="batchNo" show-overflow-tooltip="true"></el-table-column>
-                <el-table-column label="生产日期" prop="productDate" show-overflow-tooltip="true"></el-table-column>
-                <el-table-column label="失效日期" prop="expireDate" show-overflow-tooltip="true"></el-table-column>
-                <el-table-column label="打印数量" prop="count"></el-table-column>
-            </el-table>
-        </el-card>
+    </el-card>
+    <el-card class="el-card">
+      <el-table v-loading="loading" :data="detailList" style="width: 100%" border highlight-current-row>
+        <el-table-column label="序号" type="index" width="120"></el-table-column>
+        <el-table-column label="物资编码" prop="productId"></el-table-column>
+        <el-table-column label="物资名称" prop="productName" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="批次号" prop="batchNo" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="生产日期" prop="productDate" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="失效日期" prop="expireDate" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="计量单位" prop="measname" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="打印数量" prop="count"></el-table-column>
+      </el-table>
+    </el-card>
 
-        <el-dialog
-            :title="formMap[formName]"
-            :visible.sync="newSpDistributionVisible"
-            width="80%"
-            v-if="newSpDistributionVisible"
-            @close='closeDialog'
-            :close-on-click-modal="false"
-            :close-on-press-escape="false"
-        >
-            <pureApplyEdit
-                :closeDialog="closeDialog"
-                :idQuery="idQuery"
-            ></pureApplyEdit>
-        </el-dialog>
+    <el-dialog
+      :title="formMap[formName]"
+      :visible.sync="newSpDistributionVisible"
+      width="80%"
+      v-if="newSpDistributionVisible"
+      @close='closeDialog'
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+    >
+      <pureApplyEdit
+        :closeDialog="closeDialog"
+        :idQuery="idQuery"
+      ></pureApplyEdit>
+    </el-dialog>
 
 
-        <el-dialog
-            title="内部码标签打印"
-            :visible.sync="qrcodeExportVisible"
-            width="80%"
-            :close-on-click-modal="false"
-            :close-on-press-escape="false"
-            v-if="qrcodeExportVisible"
-            @close='closeQRCodeExportDialog'
-        >
-            <innerCodeDetail
-                :closeDialog="closeQRCodeExportDialog"
-                :inQuery="inQuery"
-            ></innerCodeDetail>
-        </el-dialog>
+    <el-dialog
+      title="内部码标签打印"
+      :visible.sync="qrcodeExportVisible"
+      width="80%"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      v-if="qrcodeExportVisible"
+      @close='closeQRCodeExportDialog'
+    >
+      <innerCodeDetail
+        :closeDialog="closeQRCodeExportDialog"
+        :inQuery="inQuery"
+      ></innerCodeDetail>
+    </el-dialog>
 
-    </div>
+  </div>
 </template>
 <script>
 import pureApplyEdit from "./innerOrderEditDialog";
@@ -128,273 +125,273 @@ import innerCodeDetail from "./innerCodeDetail";
 import {delInnerOrder, inserThrOrderWeb, listInnerOrder, listInnerOrderDetail} from "@/api/inventory/innerOrder";
 
 export default {
-    data() {
-        return {
-            filterQuery: {
-                recordKey: "",
-                page: 1,
-                limit: 10,
-                editStatus: 1,
+  data() {
+    return {
+      filterQuery: {
+        recordKey: "",
+        page: 1,
+        limit: 10,
+        editStatus: 1,
+      },
+      formName: null,
+      formMap: {
+        add: "新增打印单据",
+        update: "编辑打印单据",
+      },
+      statusMap: {
+        1: "未生成",
+        2: "已生成",
+      },
+      statusPrintMap: {
+        1: "未打印",
+        2: "已打印",
+      },
+      idQuery: {},
+      inQuery: {},
+      total: 0,
+      thirdSys: [],
+      thirdSysDetail: null,
+      busTypes: [],
+      originTypes: [],
+      list: [],
+      detailList: [],
+      loading: false,
+      actDateRange: [],
+      newSpDistributionVisible: false,
+      qrcodeExportVisible: false,
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
             },
-            formName: null,
-            formMap: {
-                add: "新增打印单据",
-                update: "编辑打印单据",
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
             },
-            statusMap: {
-                1: "未生成",
-                2: "已生成",
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
             },
-            statusPrintMap: {
-                1: "未打印",
-                2: "已打印",
-            },
-            idQuery: {},
-            inQuery: {},
-            total: 0,
-            thirdSys: [],
-            thirdSysDetail: null,
-            busTypes: [],
-            originTypes: [],
-            list: [],
-            detailList: [],
-            loading: false,
-            actDateRange: [],
-            newSpDistributionVisible: false,
-            qrcodeExportVisible: false,
-            pickerOptions: {
-                shortcuts: [
-                    {
-                        text: "最近一周",
-                        onClick(picker) {
-                            const end = new Date();
-                            const start = new Date();
-                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-                            picker.$emit("pick", [start, end]);
-                        },
-                    },
-                    {
-                        text: "最近一个月",
-                        onClick(picker) {
-                            const end = new Date();
-                            const start = new Date();
-                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-                            picker.$emit("pick", [start, end]);
-                        },
-                    },
-                    {
-                        text: "最近三个月",
-                        onClick(picker) {
-                            const end = new Date();
-                            const start = new Date();
-                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-                            picker.$emit("pick", [start, end]);
-                        },
-                    },
-                ],
-            },
-        };
-    },
+          },
+        ],
+      },
+    };
+  },
 
-    methods: {
-        onReset() {
-            this.$router.push({
-                path: "",
-            });
-            this.filterQuery = {
-                recordKey: "",
-                page: 1,
-                limit: 10,
-                editStatus: 1,
-            };
-            this.actDateRange = [];
-            this.getList();
-        },
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        recordKey: "",
+        page: 1,
+        limit: 10,
+        editStatus: 1,
+      };
+      this.actDateRange = [];
+      this.getList();
+    },
 
-        onSubmitFind() {
-            this.filterQuery.page = 1;
-            this.getList();
-        },
+    onSubmitFind() {
+      this.filterQuery.page = 1;
+      this.getList();
+    },
 
-        getList() {
-            if (this.actDateRange != null) {
-                this.filterQuery.startDate = this.actDateRange[0];
-                this.filterQuery.endDate = this.actDateRange[1];
-            } else {
-                this.filterQuery.startDate = null;
-                this.filterQuery.endDate = null;
-            }
+    getList() {
+      if (this.actDateRange != null) {
+        this.filterQuery.startDate = this.actDateRange[0];
+        this.filterQuery.endDate = this.actDateRange[1];
+      } else {
+        this.filterQuery.startDate = null;
+        this.filterQuery.endDate = null;
+      }
 
-            listInnerOrder(this.filterQuery)
-                .then((response) => {
-                    if (response.code == 20000) {
-                        this.list = response.data.list || [];
-                        this.total = response.data.total || 0;
-                    } else {
-                        this.$message.error(response.message);
-                    }
-                    this.loading = false;
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.list = [];
-                    this.total = 0;
-                });
-        },
-        handleDetail(row) {
-            let query = {orderIdFk: row.id};
-            this.loading = true;
-            listInnerOrderDetail(query) //查找该单号下的所有条码
-                .then((response) => {
-                    this.detailList = response.data.list || [];
-                    this.loading = false;
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.detailList = [];
-                });
-        },
-        submitOrder(row) {
-            this.loading = true;
-            let tQuery = {
-                editStatus: 2,
-                purApplyEntity: row,
-            }
-            inserThrOrderWeb(tQuery)
-                .then(response => {
-                    this.loading = false;
-                    if (response.code === 20000) {
-                        this.$message.success("提交成功！");
-                        this.getList();
-                    } else {
-                        this.$message.error(response.message);
-                    }
-                })
-                .catch(() => {
-                    this.loading = false;
-                })
-        },
-        deleteDialog(row) {
-            this.$confirm("此操作将永久删除该单据, 是否继续?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
+      listInnerOrder(this.filterQuery)
+        .then((response) => {
+          if (response.code == 20000) {
+            this.list = response.data.list || [];
+            this.total = response.data.total || 0;
+          } else {
+            this.$message.error(response.message);
+          }
+          this.loading = false;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
+    },
+    handleDetail(row) {
+      let query = {orderIdFk: row.recordKey};
+      this.loading = true;
+      listInnerOrderDetail(query) //查找该单号下的所有条码
+        .then((response) => {
+          this.detailList = response.data.list || [];
+          this.loading = false;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.detailList = [];
+        });
+    },
+    submitOrder(row) {
+      this.loading = true;
+      let tQuery = {
+        editStatus: 2,
+        purApplyEntity: row,
+      }
+      inserThrOrderWeb(tQuery)
+        .then(response => {
+          this.loading = false;
+          if (response.code === 20000) {
+            this.$message.success("提交成功！");
+            this.getList();
+          } else {
+            this.$message.error(response.message);
+          }
+        })
+        .catch(() => {
+          this.loading = false;
+        })
+    },
+    deleteDialog(row) {
+      this.$confirm("此操作将永久删除该单据, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          delInnerOrder(row.id)
+            .then((response) => {
+              this.loading = false;
+              if (response.code == 20000) {
+                this.$message.success("删除成功");
+                this.getList();
+                this.detailList = "";
+              } else {
+                this.$message.error(response.message);
+              }
             })
-                .then(() => {
-                    delInnerOrder(row.id)
-                        .then((response) => {
-                            this.loading = false;
-                            if (response.code == 20000) {
-                                this.$message.success("删除成功");
-                                this.getList();
-                                this.detailList="";
-                            } else {
-                                this.$message.error(response.message);
-                            }
-                        })
-                        .catch(() => {
-                            this.loading = false;
-                        });
+            .catch(() => {
+              this.loading = false;
+            });
 
-                })
-                .catch(() => {
-                });
-        },
-        handleCurrentChange(val) {
-            this.filterQuery.page = val.page;
-            this.getList();
-        },
+        })
+        .catch(() => {
+        });
+    },
+    handleCurrentChange(val) {
+      this.filterQuery.page = val.page;
+      this.getList();
+    },
 
-        closeDialog() {
-            this.newSpDistributionVisible = false;
-            this.getList();
-            this.detailList = [];
-        },
+    closeDialog() {
+      this.newSpDistributionVisible = false;
+      this.getList();
+      this.detailList = [];
+    },
 
 
-        closeQRCodeExportDialog() {
-            this.qrcodeExportVisible = false;
-        },
+    closeQRCodeExportDialog() {
+      this.qrcodeExportVisible = false;
+    },
 
 
-        printQRCodeText(row) {
-            this.inQuery.id = '';
-            if (this.$isNotBlank(row.id)) {
-                this.inQuery.id = row.recordKey;
-                this.inQuery.formData = row;
-                this.qrcodeExportVisible = true;
-            }
-        },
+    printQRCodeText(row) {
+      this.inQuery.id = '';
+      if (this.$isNotBlank(row.id)) {
+        this.inQuery.id = row.recordKey;
+        this.inQuery.formData = row;
+        this.qrcodeExportVisible = true;
+      }
+    },
 
-        newDistributionForm(index, row) {
-            this.idQuery.id = '';
-            if (this.$isNotBlank(row) && this.$isNotBlank(row.id)) {
-                this.idQuery.id = row.id;
-                this.idQuery.formData = row;
-                this.formName = "update";
-            } else
-                this.formName = "add";
-            this.newSpDistributionVisible = true;
-        },
+    newDistributionForm(index, row) {
+      this.idQuery.id = '';
+      if (this.$isNotBlank(row) && this.$isNotBlank(row.id)) {
+        this.idQuery.id = row.id;
+        this.idQuery.formData = row;
+        this.formName = "update";
+      } else
+        this.formName = "add";
+      this.newSpDistributionVisible = true;
+    },
 
+  }
+  ,
+  components: {
+    pureApplyEdit, innerCodeDetail
+  }
+  ,
+  filters: {
+    statusFilterType(status) {
+      const statusMap = {
+        1: "warning",
+        2: "success",
+      };
+      return statusMap[status];
     }
     ,
-    components: {
-        pureApplyEdit,innerCodeDetail
-    }
-    ,
-    filters: {
-        statusFilterType(status) {
-            const statusMap = {
-                1: "warning",
-                2: "success",
-            };
-            return statusMap[status];
-        }
-        ,
-    }
-    ,
-    mounted() {
-    }
-    ,
-    created() {
-        let end = new Date();
-        let start = new Date();
-        start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-        this.actDateRange = [start, end];
-        this.getList();
-    }
-    ,
+  }
+  ,
+  mounted() {
+  }
+  ,
+  created() {
+    let end = new Date();
+    let start = new Date();
+    start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+    this.actDateRange = [start, end];
+    this.getList();
+  }
+  ,
 }
 ;
 </script>
 <style scoped>
 .itemTag {
-    float: left;
-    text-align: left;
-    margin-top: 10px;
-    width: 25%;
+  float: left;
+  text-align: left;
+  margin-top: 10px;
+  width: 25%;
 }
 
 .text {
-    font-size: 13px;
-    font-family: "Microsoft YaHei";
+  font-size: 13px;
+  font-family: "Microsoft YaHei";
 }
 
 .query-form-item {
-    display: block !important;
-    margin-right: 10px;
-    margin-bottom: 5px;
+  display: block !important;
+  margin-right: 10px;
+  margin-bottom: 5px;
 }
 
 .el-row {
-    display: flex;
-    flex-wrap: wrap;
+  display: flex;
+  flex-wrap: wrap;
 }
 
 .el-col {
-    border-radius: 4px;
-    flex-wrap: wrap;
+  border-radius: 4px;
+  flex-wrap: wrap;
 }
 </style>
 
diff --git a/src/views/inventory/inner/innerOrderEditDialog.vue b/src/views/inventory/inner/innerOrderEditDialog.vue
index c3a8ca85..04615495 100644
--- a/src/views/inventory/inner/innerOrderEditDialog.vue
+++ b/src/views/inventory/inner/innerOrderEditDialog.vue
@@ -1,120 +1,143 @@
 <template>
-    <div>
-        <el-form :model="formData" :rules="formRules" label-width="120px" ref="dataForm">
-            <el-row type="flex" justify="end">
-                <el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px">
-                    <el-button
-                        type="primary"
-                        @click.native="saveOrder('1')"
-                        :loading="loading"
-                    >提交单据
-                    </el-button
-                    >
-                </el-button-group>
-            </el-row>
+  <div>
+    <el-form :model="formData" :rules="formRules" label-width="120px" ref="dataForm">
+      <el-row type="flex" justify="end">
+        <el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px">
+          <el-button
+            type="primary"
+            @click.native="saveOrder('1')"
+            :loading="loading"
+          >提交单据
+          </el-button
+          >
+        </el-button-group>
+      </el-row>
 
-            <el-card style="margin-top: -5px;" >
-                <el-row>
-                    <el-col :span="12">
-                        <el-form-item label="单据号" prop="billNo">
-                            <el-input v-model="formData.billNo" style="width: 90%" auto-complete="off" :disabled="true"></el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item  label="单据日期" prop="billNo">
-                            <el-input v-model="formData.billDate" style="width: 90%"  auto-complete="off" :disabled="true"></el-input>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
+      <el-card style="margin-top: -5px;" >
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="单据号" prop="billNo">
+              <el-input v-model="formData.billNo" style="width: 90%" auto-complete="off" :disabled="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item  label="单据日期" prop="billNo">
+              <el-input v-model="formData.billDate" style="width: 90%"  auto-complete="off" :disabled="true"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-                <el-row>
-                    <el-col :span="12">
-                        <el-form-item label="打印说明" prop="billNo">
-                            <el-input v-model="formData.remark" style="width: 90%"  auto-complete="off" type="textarea" autosize></el-input>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-            </el-card>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="打印说明" prop="billNo">
+              <el-input v-model="formData.remark" style="width: 90%"  auto-complete="off" type="textarea" autosize></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-card>
 
-            <el-card>
-                <el-button-group style="display: flex">
-                    <el-button type="primary" size="small" @click.native.stop="selectProductFunction()" style="margin: 0px 60px 10px auto; height: 35px" :loading="loading">产品录入</el-button>
-                </el-button-group>
+      <el-card>
+        <el-button-group style="display: flex">
+          <el-button type="primary" size="small" @click.native.stop="selectProductFunction()" style="margin: 0px 0px 10px auto; height: 35px" :loading="loading">物资录入</el-button>
+          <el-button type="primary" size="small" @click.native.stop="stockOrderList()" style=" height: 35px">选入单据</el-button>
 
-                <el-table v-loading="loading" :data="codeArray" style="width: 100%;" :row-class-name="tableRowClassName" border max-height="300" height="300" ref="multipleTable">
-                    <el-table-column label="序号" type="index" width="50"></el-table-column>
-                    <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip></el-table-column>
-                    <el-table-column label="规格型号" prop="spec"  show-overflow-tooltip></el-table-column>
-                    <el-table-column label="计量单位" prop="measname"  show-overflow-tooltip></el-table-column>
-                    <el-table-column label="生产企业"  prop="manufactory" show-overflow-tooltip></el-table-column>
-                    <el-table-column label="单据数量">
-                        <template slot-scope="scope">
-                            <el-input size="small" v-model="scope.row.count"
-                                      placeholder="请输入数量" style="width: 80%"
-                                      type='number'
-                                      :disabled="scope.row.index !== selectedIndex"
-                                      oninput="value=value.replace(/[^\d]/g,'')"></el-input>
-                        </template>
-                    </el-table-column>
+        </el-button-group>
 
-                    <el-table-column  label="批次号">
-                        <template slot-scope="scope">
-                            <el-input size="small" v-model="scope.row.batchNo"
-                                      :disabled="scope.row.index !== selectedIndex"
-                                      @input="scope.row.batchNo =scope.row.batchNo.replace(/[\W]/g, '')"
-                                      ref='inputBatchNoRef'
-                                      placeholder="请输入批次号" style="width: 80%"></el-input>
-                        </template>
-                    </el-table-column>
-                    <el-table-column  label="生产日期">
-                        <template slot-scope="scope">
-                            <el-input v-model="scope.row.productDate" auto-complete="off"
-                                      oninput="if(value.length>6)value=value.slice(0,6)"
-                                      :disabled="scope.row.index !== selectedIndex"
-                            ></el-input>
-                        </template>
-                    </el-table-column>
-                    <el-table-column  label="失效日期">
-                        <template slot-scope="scope">
-                            <el-input v-model="scope.row.expireDate" auto-complete="off"
-                                      oninput="if(value.length>6)value=value.slice(0,6)"
-                                      :disabled="scope.row.index !== selectedIndex"
-                            ></el-input>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="操作" width="120">
-                        <template slot-scope="scope">
-                            <el-button type="text" size="small" :disabled="scope.row.index !== selectedIndex" @click.stop="true" @click.native="addRowChang(scope.row)">提交</el-button>
-                            <el-button type="text" size="small" :disabled="scope.row.index === selectedIndex" @click.stop="true" @click.native="rowChange(scope.row)">编辑</el-button>
-                            <el-button type="text" size="small" @click.stop="true" @click.native="deleteCodeArray(scope.$index, scope.row)">删除</el-button>
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </el-card>
-        </el-form>
+        <el-table v-loading="loading" :data="codeArray" style="width: 100%;" :row-class-name="tableRowClassName" border max-height="300" height="300" ref="multipleTable">
+          <el-table-column label="序号" type="index" width="50"></el-table-column>
+          <el-table-column label="物资名称" prop="productName" show-overflow-tooltip></el-table-column>
+          <el-table-column label="规格型号" prop="spec"  show-overflow-tooltip></el-table-column>
+          <el-table-column label="计量单位" prop="measname"  show-overflow-tooltip></el-table-column>
+          <el-table-column label="生产企业"  prop="manufactory" show-overflow-tooltip></el-table-column>
+          <el-table-column label="单据数量">
+            <template slot-scope="scope">
+              <el-input size="small" v-model="scope.row.count"
+                        placeholder="请输入数量" style="width: 80%"
+                        type='number'
+                        :disabled="scope.row.index !== selectedIndex"
+                        oninput="value=value.replace(/[^\d]/g,'')"></el-input>
+            </template>
+          </el-table-column>
 
-        <el-dialog
-            title="产品录入"
-            :visible.sync="selectProductVisible"
-            :close-on-click-modal="false"
-            :close-on-press-escape="false"
-            width="80%"
-            v-if="selectProductVisible"
-            :append-to-body='true'
-        >
-            <stockOrderNewSelectProduct
-                :closeDialog="closeDialogC2"
-                :data="thisData"
-                :pId="pId"
-                :filterType="2"
-            ></stockOrderNewSelectProduct>
-        </el-dialog>
-    </div>
+          <el-table-column  label="批次号">
+            <template slot-scope="scope">
+              <el-input size="small" v-model="scope.row.batchNo"
+                        :disabled="scope.row.index !== selectedIndex"
+                        @input="scope.row.batchNo =scope.row.batchNo.replace(/[\W]/g, '')"
+                        ref='inputBatchNoRef'
+                        placeholder="请输入批次号" style="width: 80%"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column  label="生产日期">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.productDate" auto-complete="off"
+                        oninput="if(value.length>6)value=value.slice(0,6)"
+                        :disabled="scope.row.index !== selectedIndex"
+              ></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column  label="失效日期">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.expireDate" auto-complete="off"
+                        oninput="if(value.length>6)value=value.slice(0,6)"
+                        :disabled="scope.row.index !== selectedIndex"
+              ></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" width="120">
+            <template slot-scope="scope">
+              <el-button type="text" size="small" :disabled="scope.row.index !== selectedIndex" @click.stop="true" @click.native="addRowChang(scope.row)">提交</el-button>
+              <el-button type="text" size="small" :disabled="scope.row.index === selectedIndex" @click.stop="true" @click.native="rowChange(scope.row)">编辑</el-button>
+              <el-button type="text" size="small" @click.stop="true" @click.native="deleteCodeArray(scope.$index, scope.row)">删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-card>
+    </el-form>
+
+    <el-dialog
+      title="物资录入"
+      :visible.sync="selectProductVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      width="80%"
+      v-if="selectProductVisible"
+      :append-to-body='true'
+    >
+      <stockOrderNewSelectProduct
+        :closeDialog="closeDialogC2"
+        :data="thisData"
+        :pId="pId"
+        :billNo="billNo"
+        :filterType="2"
+      ></stockOrderNewSelectProduct>
+    </el-dialog>
+
+
+    <el-dialog
+      title="内部码打印"
+      :visible.sync="haveDistributionVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      width="80%"
+      v-if="haveDistributionVisible"
+      :append-to-body='true'
+    >
+      <stockOrder
+        :closeDialog="closeDialogC2"
+        :data="thisData"
+        :pId="pId"
+        :billNo="billNo"
+        :filterType="2"
+      ></stockOrder>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
 import draggable from "vuedraggable";
 import stockOrderNewSelectProduct from "@/views/inventory/inner/innerOrderSelectProduct";
+import stockOrder from "@/views/basic/business/stockOrderPrint";
 import {
   inserThrOrderWeb,
   delInnerOrderDetail,
@@ -124,283 +147,314 @@ import {
 import {isBlank} from "@/utils/strUtil";
 
 export default {
-    name: "idQuery",
-    props: {
-        closeDialog: {
-            type: Function,
-            required: true,
-        },
-        idQuery: {
-            type: Object,
-            required: true,
-        },
+  name: "idQuery",
+  props: {
+    closeDialog: {
+      type: Function,
+      required: true,
     },
-    data() {
-        return {
-            code: "",
-            query: {
-                orderIdFk: "",
-                page: 1,
-                limit: 10,
-            },
-            formData: {
-                id: null,
-                billNo: null,
-                billDate: "",
-                remark: "",
-                deptCode: null,
-                locStorageCode: null,
-                invWarehouseCode: null,
-            },
-            formRules: {},
-            codeArray: [],
-            total: 0,
-            pId:null,
-            loading: false,
-            index: null,
-            formLoading: false,
-            formVisible: false,
-            deleteLoading: false,
-            orderNo: null,
-            statusMap: {
-                1: "草稿",
-                2: "未审核",
-                3: "已审核",
-            },
-            typeMap: {
-                1: "预入库",
-                2: "普通采购",
-            },
-            orderEditor: true,
-            sOptions: [],
-            sValue: [],
-            sList: [],
-            sLoading: false,
-            busTypes: [],
-            currentRow: {},
-            selectedIndex: "",
-            selectProductVisible: false,
-            thisData: {},
-            storageList: [],
-            subInvList: [],
-            invQueryData: {},
-
-        };
+    idQuery: {
+      type: Object,
+      required: true,
     },
-    components: {
-        draggable,
-        stockOrderNewSelectProduct,
-    },
-    methods: {
-        saveOrder(status) {
-            this.$refs["dataForm"].validate(valid => {
-                if (valid) {
-                    if (this.codeArray.length < 1) {
-                        this.$message.warning('未添加产品');
-                        return;
-                    }
-                    if (status === '0') {
-                        for (let i = 0; i < this.codeArray.length; i++) {
-                            if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count === 0) {
-                                return this.$message.error('单据数量不能为0');
-                            }
-                        }
-                    }
-                    if (status == "1") {
-                        this.submitFunction(status);
-                    } else {
-                        if (this.codeArray.length < 1) {
-                            this.$message.warning('未添加产品');
-                            return;
-                        }
-                        for (let i = 0; i < this.codeArray.length; i++) {
-                            if (isBlank(this.codeArray[i].count) || this.codeArray[i].count === 0) {
-                                this.$message.error('单据数量不能为0');
-                                return;
-                            }
-                        }
-                        let tip = "是否确定提交订单?";
-                        this.$confirm(tip, "提示", {
-                            confirmButtonText: "确定",
-                            cancelButtonText: "取消",
-                            type: "warning",
-                        }).then(() => {
-                            this.submitFunction(status);
-                        }).catch(() => {
-                            this.loading = false;
-                        });
-                    }
-                }
-            });
-        },
-        submitFunction(status) {
-            let tMessage = status === '1' ? '保存' : '提交';
-            this.loading = true;
-            let tQuery = {
-                editStatus: status,
-                innerOrderEntity: this.formData,
-            }
-            inserThrOrderWeb(tQuery)
-                .then(response => {
-                    this.loading = false;
-                    if (response.code === 20000) {
-                        this.$message.success(tMessage + "成功");
-                        this.closeDialog(true);
-                    } else {
-                        this.$message.error(response.message);
-                    }
-                })
-                .catch(() => {
-                    this.loading = false;
-                })
-        },
-        addRowChang(row){
-          updateOrderDetail(row);
-          this.selectedIndex = "";
-        },
-        selectProductFunction() {
-          if(this.query.id==null) {
-            inserThrOrderWeb({innerOrderEntity: this.formData,editStatus:1})
-              .then(response => {
-                this.loading = false;
-                if (response.code === 20000) {
-                  this.pId=response.data;
-                  this.formData.id=this.pId
-                } else {
+  },
+  data() {
+    return {
+      code: "",
+      query: {
+        orderIdFk: "",
+        page: 1,
+        limit: 10,
+      },
+      formData: {
+        id: null,
+        billNo: null,
+        billDate: "",
+        remark: "",
+        deptCode: null,
+        locStorageCode: null,
+        invWarehouseCode: null,
+      },
+      formRules: {},
+      codeArray: [],
+      total: 0,
+      pId:null,
+      billNo:null,
+      loading: false,
+      index: null,
+      formLoading: false,
+      formVisible: false,
+      deleteLoading: false,
+      orderNo: null,
+      haveDistributionVisible:false,
+      statusMap: {
+        1: "草稿",
+        2: "未审核",
+        3: "已审核",
+      },
+      typeMap: {
+        1: "预入库",
+        2: "普通采购",
+      },
+      orderEditor: true,
+      sOptions: [],
+      sValue: [],
+      sList: [],
+      sLoading: false,
+      busTypes: [],
+      currentRow: {},
+      selectedIndex: "",
+      selectProductVisible: false,
+      thisData: {},
+      storageList: [],
+      subInvList: [],
+      invQueryData: {},
 
-                }
-              })
-              .catch(() => {
-                this.loading = false;
-              })
+    };
+  },
+  components: {
+    draggable,
+    stockOrderNewSelectProduct,
+    stockOrder,
+  },
+  methods: {
+    saveOrder(status) {
+      this.$refs["dataForm"].validate(valid => {
+        if (valid) {
+          if (this.codeArray.length < 1) {
+            this.$message.warning('未添加产品');
+            return;
           }
-
-            this.selectProductVisible = true;
-        },
-        closeDialogC2(rData) {
-            this.selectProductVisible = false;
-            this.getStockOrderDetailList();
-        },
-        rowChange(val) {
-            this.currentRow = val;
-            this.selectedIndex = val.index;
-        },
-        tableCountChange(row) {
-            if (this.$isNotBlank(row)) {
-                // row.count = row.reCount;
+          if (status === '0') {
+            for (let i = 0; i < this.codeArray.length; i++) {
+              if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count === 0) {
+                return this.$message.error('单据数量不能为0');
+              }
             }
-        },
-        tableRowClassName({row, rowIndex}) {
-            row.index = rowIndex;
-        },
-        // 刷新表单
-        resetForm() {
-            if (this.$refs["dataForm"]) {
-                // 清空验证信息表单
-                this.$refs["dataForm"].clearValidate();
-                // 刷新表单
-                this.$refs["dataForm"].resetFields();
-                this.getList();
+          }
+          if (status == "1") {
+            this.submitFunction(status);
+          } else {
+            if (this.codeArray.length < 1) {
+              this.$message.warning('未添加产品');
+              return;
+            }
+            for (let i = 0; i < this.codeArray.length; i++) {
+              if (isBlank(this.codeArray[i].count) || this.codeArray[i].count === 0) {
+                this.$message.error('单据数量不能为0');
+                return;
+              }
             }
-        },
-        deleteCodeArray(index, row) {
-            this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
+            let tip = "是否确定提交订单?";
+            this.$confirm(tip, "提示", {
+              confirmButtonText: "确定",
+              cancelButtonText: "取消",
+              type: "warning",
             }).then(() => {
-                this.$refs.multipleTable.setCurrentRow();
-                this.currentRow = {};
-                this.selectedIndex = "";
-
-                if (this.orderEditor) {
-                    this.detailLoading = true;
-                    if (this.$isNotBlank(row.id)) {
-                        delInnerOrderDetail(row.id)
-                            .then(response => {
-                                this.detailLoading = false;
-                                if (response.code === 20000) {
-                                    this.$message.success(response.data);
-                                    // this.getStockOrderDetailList();
-                                    this.codeArray.splice(index, 1);
-                                } else {
-                                    this.$message.error(response.message);
-                                }
-                            })
-                            .catch(() => {
-                                this.detailLoading = false;
-                            })
-                    } else {
-                        this.$message.success('删除成功');
-                        this.codeArray.splice(index, 1);
-                    }
-                } else {
-                    this.$message.success('删除成功');
-                    this.codeArray.splice(index, 1);
-                }
+              this.submitFunction(status);
             }).catch(() => {
-
+              this.loading = false;
             });
-        },
-        getStockOrderDetailList() {
-            this.loading = true;
-            listInnerOrderDetail({orderIdFk:this.formData.id}) //查找该单号下的所有条码
-                .then((response) => {
-                    this.codeArray = response.data.list || [];
-                    this.total = response.data.total || 0;
-                    this.loading = false;
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.list = [];
-                    this.total = 0;
-                });
-        },
+          }
+        }
+      });
+    },
+    submitFunction(status) {
+      let tMessage = status === '1' ? '保存' : '提交';
+      this.loading = true;
+      let tQuery = {
+        editStatus: status,
+        innerOrderEntity: this.formData,
+      }
+      inserThrOrderWeb(tQuery)
+        .then(response => {
+          this.loading = false;
+          if (response.code === 20000) {
+            this.$message.success(tMessage + "成功");
+            this.closeDialog(true);
+          } else {
+            this.$message.error(response.message);
+          }
+        })
+        .catch(() => {
+          this.loading = false;
+        })
+    },
+    addRowChang(row){
+      updateOrderDetail(row);
+      this.selectedIndex = "";
+    },
+    stockOrderList(){
+      debugger
+      if(this.query.id==null) {
+        inserThrOrderWeb({innerOrderEntity: this.formData,editStatus:1})
+          .then(response => {
+            this.loading = false;
+            if (response.code === 20000) {
+              this.pId=response.data.id;
+              this.billNo=response.data.recordKey;
+              this.formData.billNo=response.data.recordKey;
+              this.formData.recordKey=response.data.recordKey;
+              this.formData.id=this.pId
+            } else {
 
+            }
+          })
+          .catch(() => {
+            this.loading = false;
+          })
+      }
 
+      this.haveDistributionVisible = true;
     },
-    filters: {},
-    mounted() {
-        document.body.ondrop = function (event) {
-            event.preventDefault();
-            event.stopPropagation();
-        };
+    selectProductFunction() {
+      debugger
+      if(this.query.id==null) {
+        inserThrOrderWeb({innerOrderEntity: this.formData,editStatus:1})
+          .then(response => {
+            this.loading = false;
+            if (response.code === 20000) {
+              this.pId=response.data.id;
+              this.billNo=response.data.recordKey;
+              this.formData.billNo=response.data.recordKey;
+              this.formData.recordKey=response.data.recordKey;
+              this.formData.id=this.pId
+            } else {
+
+            }
+          })
+          .catch(() => {
+            this.loading = false;
+          })
+      }
+
+      this.selectProductVisible = true;
+    },
+    closeDialogC2(rData) {
+      this.selectProductVisible = false;
+      this.haveDistributionVisible = false;
+      this.getStockOrderDetailList();
+    },
+    rowChange(val) {
+      this.currentRow = val;
+      this.selectedIndex = val.index;
+    },
+    tableCountChange(row) {
+      if (this.$isNotBlank(row)) {
+        // row.count = row.reCount;
+      }
+    },
+    tableRowClassName({row, rowIndex}) {
+      row.index = rowIndex;
+    },
+    // 刷新表单
+    resetForm() {
+      if (this.$refs["dataForm"]) {
+        // 清空验证信息表单
+        this.$refs["dataForm"].clearValidate();
+        // 刷新表单
+        this.$refs["dataForm"].resetFields();
+        this.getList();
+      }
     },
-    created() {
-        if (this.$isNotBlank(this.idQuery.id)) {
-            this.query.limit = 100;
-            this.query.orderIdFk = this.idQuery.id;
-            this.formData = this.idQuery.formData;
-            this.formData.billNo = this.idQuery.formData.recordKey;
-            this.formData.billDate = this.idQuery.formData.createTime;
-            this.orderEditor = true;
-            this.sValue = this.formData.corpName;
-            this.getStockOrderDetailList();
+    deleteCodeArray(index, row) {
+      this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        this.$refs.multipleTable.setCurrentRow();
+        this.currentRow = {};
+        this.selectedIndex = "";
+
+        if (this.orderEditor) {
+          this.detailLoading = true;
+          if (this.$isNotBlank(row.id)) {
+            delInnerOrderDetail(row.id)
+              .then(response => {
+                this.detailLoading = false;
+                if (response.code === 20000) {
+                  this.$message.success(response.data);
+                  // this.getStockOrderDetailList();
+                  this.codeArray.splice(index, 1);
+                } else {
+                  this.$message.error(response.message);
+                }
+              })
+              .catch(() => {
+                this.detailLoading = false;
+              })
+          } else {
+            this.$message.success('删除成功');
+            this.codeArray.splice(index, 1);
+          }
         } else {
-            this.formData = {
-                id: null,
-                billNo: null,
-                billDate: "",
-                remark: "",
-                deptCode: null,
-                locStorageCode: null,
-                invWarehouseCode: null,
-            };
-            this.orderEditor = false;
+          this.$message.success('删除成功');
+          this.codeArray.splice(index, 1);
         }
-        this.codeArray = [];
+      }).catch(() => {
+
+      });
     },
+    getStockOrderDetailList() {
+      this.loading = true;
+      listInnerOrderDetail({orderIdFk:this.formData.billNo}) //查找该单号下的所有条码
+        .then((response) => {
+          this.codeArray = response.data.list || [];
+          this.total = response.data.total || 0;
+          this.loading = false;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
+    },
+
+
+  },
+  filters: {},
+  mounted() {
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+  },
+  created() {
+    if (this.$isNotBlank(this.idQuery.id)) {
+      this.query.limit = 100;
+      this.query.orderIdFk = this.idQuery.id;
+      this.formData = this.idQuery.formData;
+      this.formData.billNo = this.idQuery.formData.recordKey;
+      this.formData.billDate = this.idQuery.formData.createTime;
+      this.orderEditor = true;
+      this.sValue = this.formData.corpName;
+      this.getStockOrderDetailList();
+    } else {
+      this.formData = {
+        id: null,
+        billNo: null,
+        billDate: "",
+        remark: "",
+        deptCode: null,
+        locStorageCode: null,
+        invWarehouseCode: null,
+      };
+      this.orderEditor = false;
+    }
+    this.codeArray = [];
+  },
 };
 </script>
 <style>
 
 .ao-text {
-    width: 100%;
-    font-size: 13px;
-    font-family: "Microsoft YaHei";
-    float: right;
-    text-align: right;
-    margin-top: 10px;
+  width: 100%;
+  font-size: 13px;
+  font-family: "Microsoft YaHei";
+  float: right;
+  text-align: right;
+  margin-top: 10px;
 }
 
 </style>
diff --git a/src/views/inventory/inner/innerOrderSelectProduct.vue b/src/views/inventory/inner/innerOrderSelectProduct.vue
index 335a8c16..7889a781 100644
--- a/src/views/inventory/inner/innerOrderSelectProduct.vue
+++ b/src/views/inventory/inner/innerOrderSelectProduct.vue
@@ -1,376 +1,389 @@
 <template>
-    <div>
-        <el-card class="el-card">
-                <el-form  :model="listQuery" label-width="120px" v-show="showSearch">
-                    <el-row>
-                      <el-col :span="12">
-                        <el-form-item label="UDI码:" class="query-form-item">
-                            <el-input v-model="listQuery.UdiCode" style="width: 96%" placeholder="请扫描或输入UDI码" clearable="true" @keyup.enter.native="keyup_submit($event)"></el-input>
-                        </el-form-item>
-                      </el-col>
-                     <el-col :span="6">
-                       <el-form-item label="第三方产品编码:" class="query-form-item">
-                         <el-input v-model="listQuery.thrPiId" style="width: 90%" placeholder="请输入第三方产品编码" clearable="true"></el-input>
-                     </el-form-item>
-                  </el-col>
-                    </el-row>
+  <div>
+    <el-card class="el-card">
+      <el-form :model="listQuery" label-width="120px" v-show="showSearch">
+        <el-row>
+          <el-col :span="18">
+            <el-form-item label="UDI码:" class="query-form-item">
+              <el-input v-model="listQuery.UdiCode" style="width: 96%" placeholder="请扫描或输入UDI码" clearable="true"
+                        @keyup.enter.native="keyup_submit($event)"></el-input>
+            </el-form-item>
+          </el-col>
 
-                    <el-row>
-                      <el-col :span="6">
-                        <el-form-item label="物品编码:" class="query-form-item">
-                            <el-input v-model="listQuery.unionCode" style="width: 90%" placeholder="请输入DI/医保编码/商品条码" clearable="true"></el-input>
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="6">
-                        <el-form-item label="产品通用名:" class="query-form-item">
-                            <el-input v-model="listQuery.cpmctymc" style="width: 90%"  placeholder="请输入产品通用名" clearable="true"></el-input>
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="6">
-                        <el-form-item  label="规格型号:" class="query-form-item">
-                            <el-input v-model="listQuery.ggxh" style="width: 90%" placeholder="请输入规格型号" clearable="true"></el-input>
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="6">
-                        <el-form-item label="生产企业:" class="query-form-item">
-                          <el-input v-model="listQuery.ylqxzcrbarmc" style="width: 90%" placeholder="请输入生产企业/注册备案人"
-                                    clearable="true"></el-input>
-                        </el-form-item>
-                      </el-col>
-                    </el-row>
-                </el-form>
+        </el-row>
 
-          <div class="top-right-btn">
-            <el-button-group style="display:flex;">
-              <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
-              <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
-              <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
-              <el-button type="primary" icon="el-icon-plus" @click="confirmSelect">确定</el-button>
-            </el-button-group>
-          </div>
-          <el-divider style="margin: 15px"></el-divider>
 
-                <el-table :data="dataList" style="width: 100%"  v-loading="loading" border highlight-current-row :row-class-name="tableRowClassName" @current-change="handleChange" ref="multipleTable">
-                    <el-table-column label width="45">
-                        <template slot-scope="scope">
-                            <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="序号" type="index"></el-table-column>
-                    <el-table-column label="最小销售产品标识" prop="nameCode" width="140" show-overflow-tooltip></el-table-column>
-                    <el-table-column label="产品编码" prop="thirdId" show-overflow-tooltip></el-table-column>
-                    <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc"></el-table-column>
-                    <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip></el-table-column>
-                    <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
-                    <el-table-column label="注册/备案凭证" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
-                    <el-table-column label="器械类别" prop="qxlb" show-overflow-tooltip></el-table-column>
-                    <el-table-column label="配送企业" prop="companyName" show-overflow-tooltip></el-table-column>
-                    <el-table-column label="操作"  width="160">
-                        <template slot-scope="scope">
-                            <el-button type="text" size="small" @click.native.stop="handleDetailClick(scope.row)">详情</el-button>
-                        </template>
-                    </el-table-column>
-                </el-table>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="第三方产品编码:" class="query-form-item">
+              <el-input v-model="listQuery.thrPiId" style="width: 90%" placeholder="请输入第三方产品编码"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="物品编码:" class="query-form-item">
+              <el-input v-model="listQuery.unionCode" style="width: 90%" placeholder="请输入DI/医保编码/商品条码"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
 
-          <pagination
-            v-show="pageTotal>0"
-            :total="pageTotal"
-            :page.sync="listQuery.page"
-            :limit.sync="listQuery.limit"
-            @pagination="handleErpPageChange"
+          <el-col :span="8">
+            <el-form-item label="物资名称:" class="query-form-item">
+              <el-input v-model="listQuery.cpmctymc" style="width: 90%" placeholder="请输入物资名称"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="规格型号:" class="query-form-item">
+              <el-input v-model="listQuery.ggxh" style="width: 90%" placeholder="请输入规格型号" clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="生产企业:" class="query-form-item">
+              <el-input v-model="listQuery.ylqxzcrbarmc" style="width: 90%" placeholder="请输入生产企业/注册备案人"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
 
-          ></pagination>
-        </el-card>
+      <div class="top-right-btn">
+        <el-button-group style="display:flex;">
+          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+          <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
+          <el-button type="primary" icon="el-icon-plus" @click="confirmSelect">确定</el-button>
+        </el-button-group>
+      </div>
+      <el-divider style="margin: 15px"></el-divider>
 
+      <el-table :data="dataList" style="width: 100%" v-loading="loading" border highlight-current-row
+                :row-class-name="tableRowClassName" @current-change="handleChange" ref="multipleTable">
+        <el-table-column label width="45">
+          <template slot-scope="scope">
+            <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
+          </template>
+        </el-table-column>
+        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="最小销售产品标识" prop="nameCode" width="140" show-overflow-tooltip></el-table-column>
+        <el-table-column label="产品编码" prop="thirdId" show-overflow-tooltip></el-table-column>
+        <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc"></el-table-column>
+        <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
+        <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
+        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
+        <el-table-column label="器械类别" prop="qxlb" show-overflow-tooltip></el-table-column>
+        <el-table-column label="配送企业" prop="companyName" show-overflow-tooltip></el-table-column>
+        <el-table-column label="操作" width="160">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click.native.stop="handleDetailClick(scope.row)">详情</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
 
-        <el-dialog
-            title="耗材字典详情"
-            :visible.sync="udiRlDetailVisible"
-            width="80%"
-            :close-on-click-modal="false"
-            :close-on-press-escape="false"
-            append-to-body
-            v-if="udiRlDetailVisible"
-        >
-            <udiRlDetailDialog :editQuery="currentRow"></udiRlDetailDialog>
-        </el-dialog>
+      <pagination
+        v-show="pageTotal>0"
+        :total="pageTotal"
+        :page.sync="listQuery.page"
+        :limit.sync="listQuery.limit"
+        @pagination="handleErpPageChange"
 
-        <el-dialog title="请选择对应的资质证书" :visible.sync="dialogFormVisible" append-to-body width="40%">
-            <el-form :model="form">
-                <el-form-item label="" prop="isGive">
-                    <el-radio-group v-model="currentCert">
-                        <el-radio :label="item" :key="item" v-for="item in certList">{{ item }}</el-radio>
-                    </el-radio-group>
-                </el-form-item>
-            </el-form>
-            <div slot="footer" class="dialog-footer">
-                <el-button type="primary" @click="selectCert">确 定</el-button>
-                <el-button @click="dialogFormVisible = false">取 消</el-button>
-            </div>
-        </el-dialog>
+      ></pagination>
+    </el-card>
 
-    </div>
+
+    <el-dialog
+      title="耗材字典详情"
+      :visible.sync="udiRlDetailVisible"
+      width="80%"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      append-to-body
+      v-if="udiRlDetailVisible"
+    >
+      <udiRlDetailDialog :editQuery="currentRow"></udiRlDetailDialog>
+    </el-dialog>
+
+    <el-dialog title="请选择对应的资质证书" :visible.sync="dialogFormVisible" append-to-body width="40%">
+      <el-form :model="form">
+        <el-form-item label="" prop="isGive">
+          <el-radio-group v-model="currentCert">
+            <el-radio :label="item" :key="item" v-for="item in certList">{{ item }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="selectCert">确 定</el-button>
+        <el-button @click="dialogFormVisible = false">取 消</el-button>
+      </div>
+    </el-dialog>
+
+  </div>
 </template>
 
 <script>
 import {filterCompanyProductRelevance} from "../../../api/basic/udiRlSuptRelevance";
-import {addApplyDetail,addApply} from "../../../api/purchase/purApply";
+import {addApplyDetail, addApply} from "../../../api/purchase/purApply";
 import store from "../../../store";
 import udiRlDetailDialog from "./../../purchase/purApply/purUdiRlDetailDialog";
 import {addOrderDetail} from "@/api/inventory/innerOrder";
 
 export default {
-    name: "stockOrderNewSelectProduct",
-    props: {
-        data: {
-            type: Object,
-            required: true,
-        },
-        closeDialog: {
-            type: Function,
-            required: true,
-        },
-        purType: {
-            type: Object,
-            required: true,
-        },
-        pId: {
-          type: Object,
-          required: true,
-        },
+  name: "stockOrderNewSelectProduct",
+  props: {
+    data: {
+      type: Object,
+      required: true,
+    },
+    closeDialog: {
+      type: Function,
+      required: true,
+    },
+    purType: {
+      type: Object,
+      required: true,
+    },
+    pId: {
+      type: Object,
+      required: true,
+    },
+    billNo: {
+      type: Object,
+      required: true,
     },
+  },
 
-    data() {
-        return {
-            showSearch: true,
-            listQuery: {
-                purType: null,
-                udiCode: null,
-                unicode: null,
-                cpmctymc: null,
-                ggxh: null,
-                ylqxzcrbarmc: null,
-                thrPiId: null,
-                page: 1,
-                limit: 10,
+  data() {
+    return {
+      showSearch: true,
+      listQuery: {
+        purType: null,
+        udiCode: null,
+        unicode: null,
+        cpmctymc: null,
+        ggxh: null,
+        ylqxzcrbarmc: null,
+        thrPiId: null,
+        page: 1,
+        limit: 10,
+      },
+      combineQuery: {
+        thirdId: "",
+        relId: "",
+        erpName: "",
+        keys: [],
+      },
+      ids: [],
+      radioCheck: null,
+      dataList: [],
+      pageTotal: 1,
+      total: 1,
+      currentRow: null,
+      loading: false,
+      udiRlDetailVisible: false,
+      thirdSys: [],
+      thirdSysFk: null,
+      busTypes: [],
+      actDateRange: [],
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
             },
-            combineQuery: {
-                thirdId: "",
-                relId: "",
-                erpName: "",
-                keys: [],
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
             },
-            ids:[],
-            radioCheck: null,
-            dataList: [],
-            pageTotal: 1,
-            total: 1,
-            currentRow: null,
-            loading: false,
-            udiRlDetailVisible: false,
-            thirdSys: [],
-            thirdSysFk: null,
-            busTypes: [],
-            actDateRange: [],
-            pickerOptions: {
-                shortcuts: [
-                    {
-                        text: "最近一周",
-                        onClick(picker) {
-                            const end = new Date();
-                            const start = new Date();
-                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-                            picker.$emit("pick", [start, end]);
-                        },
-                    },
-                    {
-                        text: "最近一个月",
-                        onClick(picker) {
-                            const end = new Date();
-                            const start = new Date();
-                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-                            picker.$emit("pick", [start, end]);
-                        },
-                    },
-                    {
-                        text: "最近三个月",
-                        onClick(picker) {
-                            const end = new Date();
-                            const start = new Date();
-                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-                            picker.$emit("pick", [start, end]);
-                        },
-                    },
-                ],
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
             },
-            orderEditor: false,
-            orderId: "",
-            currentCert: null,
-            certList: [],
-            dialogFormVisible: false,
-            multipleSelection: null,
-        };
+          },
+        ],
+      },
+      orderEditor: false,
+      orderId: "",
+      currentCert: null,
+      certList: [],
+      dialogFormVisible: false,
+      multipleSelection: null,
+    };
+  },
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.listQuery = {
+        purType: null,
+        udiCode: null,
+        unicode: null,
+        cpmctymc: null,
+        ggxh: null,
+        ylqxzcrbarmc: null,
+        thrPiId: null,
+        page: 1,
+        limit: 10
+      }
+      this.multipleSelection = [];
+      this.radioCheck = null;
+      this.currentRow = null;
+      this.getList();
     },
-    methods: {
-        onReset() {
-            this.$router.push({
-                path: "",
-            });
-            this.listQuery = {
-                purType: null,
-                udiCode: null,
-                unicode: null,
-                cpmctymc: null,
-                ggxh: null,
-                ylqxzcrbarmc: null,
-                thrPiId: null,
-                page: 1,
-                limit: 10
-            }
-            this.multipleSelection = [];
-            this.radioCheck = null;
-            this.currentRow = null;
-            this.getList();
-        },
-        hideSearch() {
-          this.showSearch = !this.showSearch;
-        },
-        tableRowClassName({row}) {
-            if (row.checked) return "warning-row";
-            return "";
-        },
-        checkSelectable(row) {
-            return !row.check;
-        },
-        handleCurrentChange(val) {
-            this.unionQuery.page = val;
-            this.getList();
-        },
-        handleChange(val) {
-            this.radioCheck = val.id;
-            this.currentRow = val;
-            this.multipleSelection = val
-        },
-        handleDetailClick(row) {
-            this.currentRow = row;
-            this.udiRlDetailVisible = true;
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+    tableRowClassName({row}) {
+      if (row.checked) return "warning-row";
+      return "";
+    },
+    checkSelectable(row) {
+      return !row.check;
+    },
+    handleCurrentChange(val) {
+      this.unionQuery.page = val;
+      this.getList();
+    },
+    handleChange(val) {
+      this.radioCheck = val.id;
+      this.currentRow = val;
+      this.multipleSelection = val
+    },
+    handleDetailClick(row) {
+      this.currentRow = row;
+      this.udiRlDetailVisible = true;
 
-        },
-        handleErpPageChange(val) {
-            this.listQuery.page = val.page;
-            this.getList();
-        },
-        keyup_submit(event) {
-            this.listQuery.page = 1;
-            this.getList();
-            event.target.select();
-        },
-        search() {
-            this.listQuery.page = 1;
-            this.getList();
-        },
-        getList() {
-            this.loading = true;
-            this.listQuery.customerId = store.getters.customerId;
-            filterCompanyProductRelevance(this.listQuery)
-            .then((response) => {
-              this.loading = false;
-              if (response.code === 20000) {
-                this.dataList = response.data.list || [];
-                this.pageTotal = response.data.total || 0;
-              } else {
-                this.$message.error(response.message);
-                this.dataList = [];
-                this.pageTotal = 0;
-              }
-            })
-            .catch(() => {
-              this.loading = false;
-              this.dataList = [];
-              this.pageTotal = 0;
-            });
-        },
-        intentBack() {
-            this.closeDialog();
-        },
+    },
+    handleErpPageChange(val) {
+      this.listQuery.page = val.page;
+      this.getList();
+    },
+    keyup_submit(event) {
+      this.listQuery.page = 1;
+      this.getList();
+      event.target.select();
+    },
+    search() {
+      this.listQuery.page = 1;
+      this.getList();
+    },
+    getList() {
+      this.loading = true;
+      this.listQuery.customerId = store.getters.customerId;
+      filterCompanyProductRelevance(this.listQuery)
+        .then((response) => {
+          this.loading = false;
+          if (response.code === 20000) {
+            this.dataList = response.data.list || [];
+            this.pageTotal = response.data.total || 0;
+          } else {
+            this.$message.error(response.message);
+            this.dataList = [];
+            this.pageTotal = 0;
+          }
+        })
+        .catch(() => {
+          this.loading = false;
+          this.dataList = [];
+          this.pageTotal = 0;
+        });
+    },
+    intentBack() {
+      this.closeDialog();
+    },
 
 
-        confirmSelect() {
-            if (this.multipleSelection == null) {
-                this.$message.error('未选择产品');
-                return;
-            }
+    confirmSelect() {
+      if (this.multipleSelection == null) {
+        this.$message.error('未选择产品');
+        return;
+      }
 
-            if(this.ids.length>0){
-                for(var i=0;i<this.ids.length;i++){
-                   if(this.ids[i]==this.multipleSelection.rlId){
-                    this.$message.error("该产品已录入！");
-                    return
-                   }
-                }
-            }
-            let str = this.multipleSelection.zczbhhzbapzbh;
-            if (str.search(",") != -1) {
-                this.currentCert = null;
-                this.certList = str.split(',');
-                this.dialogFormVisible = true;
-            } else {
-                this.combine();
-            }
-        },
+      if (this.ids.length > 0) {
+        for (var i = 0; i < this.ids.length; i++) {
+          if (this.ids[i] == this.multipleSelection.rlId) {
+            this.$message.error("该产品已录入！");
+            return
+          }
+        }
+      }
+      let str = this.multipleSelection.zczbhhzbapzbh;
+      if (str.search(",") != -1) {
+        this.currentCert = null;
+        this.certList = str.split(',');
+        this.dialogFormVisible = true;
+      } else {
+        this.combine();
+      }
+    },
 
-        combine() {
-            this.loading = true;
-            let tQuery = {
-              productId:this.multipleSelection.rlId,
-              productName:this.multipleSelection.cpmctymc,
-              count:1,
-              orderIdFk:this.pId,
-              supId:this.multipleSelection.customerId,
-              zczbhhzbapzbh:this.multipleSelection.zczbhhzbapzbh
-            };
-          addOrderDetail(tQuery).then((response) => {
-                this.loading = false;
-                if (response.code === 20000) {
-                    this.closeDialog(response.data);
-                } else {
-                    if (response.code == 601) {
-                        this.$alert(response.message, "提示", {
-                            confirmButtonText: "确定",
-                        });
-                    } else
-                        this.$message.error(response.message);
-                }
-            }).catch(() => {
-                this.loading = false;
+    combine() {
+      this.loading = true;
+      let tQuery = {
+        productId: this.multipleSelection.rlId,
+        productName: this.multipleSelection.cpmctymc,
+        count: 1,
+        orderIdFk: this.billNo,
+        supId: this.multipleSelection.customerId,
+        zczbhhzbapzbh: this.multipleSelection.zczbhhzbapzbh
+      };
+      addOrderDetail(tQuery).then((response) => {
+        this.loading = false;
+        if (response.code === 20000) {
+          this.closeDialog(response.data);
+        } else {
+          if (response.code == 601) {
+            this.$alert(response.message, "提示", {
+              confirmButtonText: "确定",
             });
+          } else
+            this.$message.error(response.message);
+        }
+      }).catch(() => {
+        this.loading = false;
+      });
 
-        },
+    },
 
-        selectCert() {
-            if (this.currentCert == null) {
-                this.$message.error("请先选择对应的注册证！");
-            }else{
-               this.multipleSelection.zczbhhzbapzbh = this.currentCert;
-               this.combine();
-            }
+    selectCert() {
+      if (this.currentCert == null) {
+        this.$message.error("请先选择对应的注册证！");
+      } else {
+        this.multipleSelection.zczbhhzbapzbh = this.currentCert;
+        this.combine();
+      }
 
-        },
     },
-    components: {udiRlDetailDialog},
+  },
+  components: {udiRlDetailDialog},
 
-    created() {
-        console.log(this.data)
-        if (this.$isNotBlank(this.data)) {
-            this.ids=[];
-            if(this.data.stockOrderLists.length>0){
-                for(var i=0;i<this.data.stockOrderLists.length;i++){
-                    this.ids.push(this.data.stockOrderLists[i].productId);
-                }
-            }
+  created() {
+    if (this.$isNotBlank(this.data)) {
+      this.ids = [];
+      if (this.data.stockOrderLists.length > 0) {
+        for (var i = 0; i < this.data.stockOrderLists.length; i++) {
+          this.ids.push(this.data.stockOrderLists[i].productId);
         }
+      }
+    }
 
-    },
+  },
 };
 </script>
 
@@ -378,10 +391,10 @@ export default {
 
 
 div /deep/ .el-table .warning-row {
-    background: #bebebe;
+  background: #bebebe;
 }
 
 div /deep/ .el-table .success-row {
-    background: #ffffff;
+  background: #ffffff;
 }
 </style>
diff --git a/src/views/purchase/cert/supCertSearch.vue b/src/views/purchase/cert/supCertSearch.vue
index 39871247..9ad25aaa 100644
--- a/src/views/purchase/cert/supCertSearch.vue
+++ b/src/views/purchase/cert/supCertSearch.vue
@@ -629,7 +629,6 @@ export default {
             this.loading = true;
             verifyTemplateFile(query).then((res) => {
                 if (res.code === 20000) {
-                  debugger
                     //查询全部详情id
                     var supCertQuery={
                         customerId:row.customerId,
@@ -671,7 +670,6 @@ export default {
             let query = {id: 3};
             this.loading = true;
             verifyTemplateFile(query).then((res) => {
-              debugger
                 if (res.code === 20000) {
                     //查询全部详情id
                     var supCertQuery={
diff --git a/src/views/purchase/company/supCompanyEditDialog.vue b/src/views/purchase/company/supCompanyEditDialog.vue
index 65873d27..8b77c742 100644
--- a/src/views/purchase/company/supCompanyEditDialog.vue
+++ b/src/views/purchase/company/supCompanyEditDialog.vue
@@ -587,7 +587,6 @@ export default {
 
 
     getCompanyCertList() {
-      debugger
       this.certLoading = true;
       this.certQuery.customerId = this.inputQuery.customerId;
       console.log(this.customerId)
diff --git a/src/views/purchase/purApply/purUdiRlDetailDialog.vue b/src/views/purchase/purApply/purUdiRlDetailDialog.vue
index 0671f838..0f7fa7e0 100644
--- a/src/views/purchase/purApply/purUdiRlDetailDialog.vue
+++ b/src/views/purchase/purApply/purUdiRlDetailDialog.vue
@@ -1,190 +1,190 @@
 <template>
-    <div>
-      <el-table :data="sysList" style="width: 100%" border highlight-current-row>
-        <el-table-column label="序号" type="index"></el-table-column>
-        <el-table-column label="第三方系统名称" prop="sysName" show-overflow-tooltip></el-table-column>
-        <el-table-column label="第三方产品名称" prop="thirdName" show-overflow-tooltip></el-table-column>
-        <el-table-column label="第三方产品ID" prop="thirdId" show-overflow-tooltip></el-table-column>
-      </el-table>
+  <div>
+    <el-table :data="sysList" style="width: 100%" border highlight-current-row>
+      <el-table-column label="序号" type="index"></el-table-column>
+      <el-table-column label="第三方系统名称" prop="sysName" show-overflow-tooltip></el-table-column>
+      <el-table-column label="第三方产品名称" prop="thirdName" show-overflow-tooltip></el-table-column>
+      <el-table-column label="第三方产品ID" prop="thirdId" show-overflow-tooltip></el-table-column>
+    </el-table>
 
-      <el-table v-loading="loading" :data="detailList" style="width: 100%; margin-top: 20px" border @current-change="handleDetail" border highlight-current-row>
-        <el-table-column label="产品标识" prop="nameCode" show-overflow-tooltip></el-table-column>
-        <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip></el-table-column>
-        <el-table-column label="包装级别" prop="packLevel" show-overflow-tooltip></el-table-column>
-        <el-table-column label="包装层级" prop="bzcj" show-overflow-tooltip></el-table-column>
-      </el-table>
+    <el-table v-loading="loading" :data="detailList" style="width: 100%; margin-top: 20px" border @current-change="handleDetail" border highlight-current-row>
+      <el-table-column label="产品标识" prop="nameCode" show-overflow-tooltip></el-table-column>
+      <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
+      <el-table-column label="包装级别" prop="packLevel" show-overflow-tooltip></el-table-column>
+      <el-table-column label="包装层级" prop="bzcj" show-overflow-tooltip></el-table-column>
+    </el-table>
 
 
-      <el-form :model="editQuery" :rules="rules" ref="editQuery" label-width="190px" style="margin-top: 20px">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="产品名称" prop="cpmctymc">
-              <el-input style="width: 90%" size="small" splaceholder="请输入产品名称" :disabled="true" v-model="editQuery.cpmctymc"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12" class="el-col">
-            <el-form-item label="产品标识" prop="nameCode">
-              <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入产品标识" v-model="editQuery.nameCode"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
+    <el-form :model="editQuery" :rules="rules" ref="editQuery" label-width="190px" style="margin-top: 20px">
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="物资名称" prop="cpmctymc">
+            <el-input style="width: 90%" size="small" splaceholder="请输入物资名称" :disabled="true" v-model="editQuery.cpmctymc"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12" class="el-col">
+          <el-form-item label="产品标识" prop="nameCode">
+            <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入产品标识" v-model="editQuery.nameCode"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
 
-        <el-row>
-          <el-col :span="12" class="el-col">
-            <el-form-item label="规格型号" prop="ggxh">
-              <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容" v-model="editQuery.ggxh"></el-input>
-            </el-form-item>
-          </el-col>
+      <el-row>
+        <el-col :span="12" class="el-col">
+          <el-form-item label="规格型号" prop="ggxh">
+            <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容" v-model="editQuery.ggxh"></el-input>
+          </el-form-item>
+        </el-col>
 
-          <el-col :span="12" class="el-col">
-            <el-form-item label="器械类别" prop="qxlb">
-              <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入器械类别" v-model="editQuery.qxlb"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
+        <el-col :span="12" class="el-col">
+          <el-form-item label="器械类别" prop="qxlb">
+            <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入器械类别" v-model="editQuery.qxlb"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
 
-        <el-row>
-          <el-col :span="12" class="el-col">
-            <el-form-item label="产品类别" prop="cplb">
-              <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入产品类别" v-model="editQuery.cplb"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12" class="el-col">
-            <el-form-item label="分类编码" prop="flbm">
-              <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入分类编码" v-model="editQuery.flbm"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
+      <el-row>
+        <el-col :span="12" class="el-col">
+          <el-form-item label="产品类别" prop="cplb">
+            <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入产品类别" v-model="editQuery.cplb"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12" class="el-col">
+          <el-form-item label="分类编码" prop="flbm">
+            <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入分类编码" v-model="editQuery.flbm"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
 
-        <el-row>
-          <el-col :span="12" class="el-col">
-            <el-form-item label="商品条码" prop="sptm">
-              <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入商品条码" v-model="editQuery.sptm"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12" class="el-col">
-            <el-form-item label="医保编码" prop="ybbm">
-              <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入医保编码" v-model="editQuery.ybbm"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
+      <el-row>
+        <el-col :span="12" class="el-col">
+          <el-form-item label="商品条码" prop="sptm">
+            <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入商品条码" v-model="editQuery.sptm"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12" class="el-col">
+          <el-form-item label="医保编码" prop="ybbm">
+            <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入医保编码" v-model="editQuery.ybbm"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
 
-        <el-row>
-          <el-col :span="12" class="el-col">
-            <el-form-item label="医疗器械注册人" prop="ylqxzcrbarmc">
-              <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入医疗器械注册人" v-model="editQuery.ylqxzcrbarmc"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12" class="el-col">
-            <el-form-item label="注册人英文名称" prop="ylqxzcrbarywmc">
-              <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入注册人英文名称" v-model="editQuery.ylqxzcrbarywmc"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
+      <el-row>
+        <el-col :span="12" class="el-col">
+          <el-form-item label="医疗器械注册人" prop="ylqxzcrbarmc">
+            <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入医疗器械注册人" v-model="editQuery.ylqxzcrbarmc"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12" class="el-col">
+          <el-form-item label="注册人英文名称" prop="ylqxzcrbarywmc">
+            <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入注册人英文名称" v-model="editQuery.ylqxzcrbarywmc"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
 
-        <el-row>
-          <el-col :span="12" class="el-col">
-            <el-form-item label="统一社会信用号" prop="tyshxydm">
-              <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入统一社会信用号" v-model="editQuery.tyshxydm"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12" class="el-col">
-            <el-form-item label="注册证/备案号" prop="zczbhhzbapzbh">
-              <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入注册证/备案号" v-model="editQuery.zczbhhzbapzbh"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
+      <el-row>
+        <el-col :span="12" class="el-col">
+          <el-form-item label="统一社会信用号" prop="tyshxydm">
+            <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入统一社会信用号" v-model="editQuery.tyshxydm"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12" class="el-col">
+          <el-form-item label="注册证/备案号" prop="zczbhhzbapzbh">
+            <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入注册证/备案号" v-model="editQuery.zczbhhzbapzbh"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
 
-        <el-row>
-          <el-col :span="12" class="el-col">
-            <el-form-item label="上级物资编码" prop="sjcpbm">
-              <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入上级物资编码" v-model="editQuery.sjcpbm"></el-input>
-            </el-form-item>
-          </el-col>
+      <el-row>
+        <el-col :span="12" class="el-col">
+          <el-form-item label="上级产品编码" prop="sjcpbm">
+            <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入上级产品编码" v-model="editQuery.sjcpbm"></el-input>
+          </el-form-item>
+        </el-col>
 
-          <el-col :span="12" class="el-col">
-            <el-form-item label="包装级别" prop="packLevel">
-              <el-input style="width: 90%" size="small" splaceholder="请输入包装级别" :disabled="true" v-model="editQuery.packLevel"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
+        <el-col :span="12" class="el-col">
+          <el-form-item label="包装级别" prop="packLevel">
+            <el-input style="width: 90%" size="small" splaceholder="请输入包装级别" :disabled="true" v-model="editQuery.packLevel"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
 
-        <el-row>
-          <el-col :span="12" class="el-col">
-            <el-form-item label="包装层级" prop="bzcj">
-              <el-input style="width: 90%" size="small" splaceholder="请输入包装层级" v-model="editQuery.bzcj" :disabled="true"></el-input>
-            </el-form-item>
-          </el-col>
+      <el-row>
+        <el-col :span="12" class="el-col">
+          <el-form-item label="包装层级" prop="bzcj">
+            <el-input style="width: 90%" size="small" splaceholder="请输入包装层级" v-model="editQuery.bzcj" :disabled="true"></el-input>
+          </el-form-item>
+        </el-col>
 
-          <el-col :span="12" class="el-col">
-            <el-form-item label="包含下级包装数量" prop="bhxjsl">
-              <el-input style="width: 90%" size="small" splaceholder="请输入包含下级包装数量" :disabled="true" v-model="editQuery.bhxjsl"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
+        <el-col :span="12" class="el-col">
+          <el-form-item label="包含下级包装数量" prop="bhxjsl">
+            <el-input style="width: 90%" size="small" splaceholder="请输入包含下级包装数量" :disabled="true" v-model="editQuery.bhxjsl"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
 
-        <el-row>
-          <el-col :span="12" class="el-col">
-            <el-form-item label="包含下级物资编码" prop="bhxjcpbm">
-              <el-input style="width: 90%" size="small" :disabled="true" splaceholder="请输入包含下级物资编码" v-model="editQuery.bhxjcpbm"></el-input>
-            </el-form-item>
-          </el-col>
+      <el-row>
+        <el-col :span="12" class="el-col">
+          <el-form-item label="包含下级产品编码" prop="bhxjcpbm">
+            <el-input style="width: 90%" size="small" :disabled="true" splaceholder="请输入包含下级产品编码" v-model="editQuery.bhxjcpbm"></el-input>
+          </el-form-item>
+        </el-col>
 
-          <el-col :span="12" class="el-col">
-            <el-form-item label="包含最小销售包装数量" prop="bhzxxsbzsl">
-              <el-input style="width: 90%" size="small" :disabled="true" splaceholder="请输入包含最小销售包装数量" v-model="editQuery.bhzxxsbzsl"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
+        <el-col :span="12" class="el-col">
+          <el-form-item label="包含最小销售包装数量" prop="bhzxxsbzsl">
+            <el-input style="width: 90%" size="small" :disabled="true" splaceholder="请输入包含最小销售包装数量" v-model="editQuery.bhzxxsbzsl"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
 
-        <el-row>
-          <el-col :span="12" class="el-col">
-            <el-form-item label="是否包含批号" prop="scbssfbhph">
-              <el-input style="width: 90%" :disabled="true" size="small"  v-model="editQuery.scbssfbhph"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12" class="el-col">
-            <el-form-item label="是否包含序列号" prop="scbssfbhxlh">
-              <el-input style="width: 90%" :disabled="true" size="small" v-model="editQuery.scbssfbhxlh" splaceholder="请输入内容"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
+      <el-row>
+        <el-col :span="12" class="el-col">
+          <el-form-item label="是否包含批号" prop="scbssfbhph">
+            <el-input style="width: 90%" :disabled="true" size="small"  v-model="editQuery.scbssfbhph"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12" class="el-col">
+          <el-form-item label="是否包含序列号" prop="scbssfbhxlh">
+            <el-input style="width: 90%" :disabled="true" size="small" v-model="editQuery.scbssfbhxlh" splaceholder="请输入内容"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
 
-        <el-row>
-          <el-col :span="12" class="el-col">
-            <el-form-item label="是否包含生产日期" prop="scbssfbhscrq">
-              <el-input style="width: 90%" :disabled="true" size="small" v-model="editQuery.scbssfbhscrq"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12" class="el-col">
-            <el-form-item label="是否包含失效日期" prop="scbssfbhsxrq">
-              <el-input style="width: 90%" :disabled="true" v-model="editQuery.scbssfbhsxrq" ></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
+      <el-row>
+        <el-col :span="12" class="el-col">
+          <el-form-item label="是否包含生产日期" prop="scbssfbhscrq">
+            <el-input style="width: 90%" :disabled="true" size="small" v-model="editQuery.scbssfbhscrq"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12" class="el-col">
+          <el-form-item label="是否包含失效日期" prop="scbssfbhsxrq">
+            <el-input style="width: 90%" :disabled="true" v-model="editQuery.scbssfbhsxrq" ></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
 
-        <el-row>
-          <el-col :span="12" class="el-col">
-            <el-form-item label="产品描述" prop="cpms">
-              <el-input style="width: 90%" :disabled="true" size="small"  v-model="editQuery.cpms"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12" class="el-col">
-            <el-form-item label="计量单位" prop="measname">
-              <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容" v-model="editQuery.measname"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row >
-          <el-col :span="12" class="el-col">
-            <el-form-item label="最小包装单元内包含使用单元数量" prop="zxxsbzbhsydysl">
-              <el-input style="width: 90%" :disabled="!checked" size="small" splaceholder="请输入内容" v-model="editQuery.zxxsbzbhsydysl"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+      <el-row>
+        <el-col :span="12" class="el-col">
+          <el-form-item label="产品描述" prop="cpms">
+            <el-input style="width: 90%" :disabled="true" size="small"  v-model="editQuery.cpms"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12" class="el-col">
+          <el-form-item label="计量单位" prop="measname">
+            <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容" v-model="editQuery.measname"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row >
+        <el-col :span="12" class="el-col">
+          <el-form-item label="使用单元数量" prop="zxxsbzbhsydysl">
+            <el-input style="width: 90%" :disabled="!checked" size="small" splaceholder="请输入内容" v-model="editQuery.zxxsbzbhsydysl"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
 
-    </div>
+  </div>
 </template>
 
 <script>
@@ -192,26 +192,26 @@ import {thirdSysDetail} from "@/api/basic/udiRelevance";
 import {filterByUuid} from "@/api/basic/udiInfo";
 
 export default {
-    name: "UdiRlDetail",
-    props: {
-        editQuery: {
-            type: Object,
-            required: true,
-        },
-    },
-    data() {
-        return {
-            sysList: [],
-            checked: false,
-            detailList: [],
-            loading: false,
-        }
+  name: "UdiRlDetail",
+  props: {
+    editQuery: {
+      type: Object,
+      required: true,
     },
-    methods: {
-        getThirdSysDetail() {
-            let query = {
-                id: this.editQuery.rlId,
-            };
+  },
+  data() {
+    return {
+      sysList: [],
+      checked: false,
+      detailList: [],
+      loading: false,
+    }
+  },
+  methods: {
+    getThirdSysDetail() {
+      let query = {
+        id: this.editQuery.rlId,
+      };
 
             thirdSysDetail(query)
                 .then((response) => {
@@ -237,18 +237,18 @@ export default {
         },
     },
 
-    created() {
-        if(this.editQuery.isUseDy==1){
-            this.checked=true
-        }
-        let ttquery = {
-            id: this.editQuery.rlId,
-            page: 1,
-            limit: 10,
-        };
-        this.getDetailList(ttquery);
-        this.getThirdSysDetail();
-    },
+  created() {
+    if(this.editQuery.isUseDy==1){
+      this.checked=true
+    }
+    let ttquery = {
+      id: this.editQuery.rlId,
+      page: 1,
+      limit: 10,
+    };
+    this.getDetailList(ttquery);
+    this.getThirdSysDetail();
+  },
 }
 </script>