Merge branch 'master' of http://62.234.61.92:3000/wjm/mec-cloud_IntelligentManufacturing_CLIENT

zkqy-ui/src/api/tablelist/commonTable.js

@@ -20,6 +20,7 @@ export function unionListTableData(query) {
     //baseURL: process.env.VUE_APP_BASE_API1
   })
 }
+
 // 定制的订单列表查询方法
 export function getTableList1(query) {
   return request({
@@ -29,6 +30,7 @@ export function getTableList1(query) {
     //baseURL: process.env.VUE_APP_BASE_API1
   })
 }
+
 // 审批列表查询方法
 export function getTableList2(query) {
   return request({
@@ -286,6 +288,7 @@ export function productInvoiceInfo(data) {
     //baseURL: process.env.VUE_APP_BASE_API1
   })
 }
+
 // 订单管理  发货单详情接口 新
 export function printDocuments(data) {
   return request({
@@ -295,6 +298,7 @@ export function printDocuments(data) {
     //baseURL: process.env.VUE_APP_BASE_API1
   })
 }
+
 // 订单管理  新增发货单接口
 export function addProductInvoice(data) {
   return request({
@@ -304,6 +308,7 @@ export function addProductInvoice(data) {
     //baseURL: process.env.VUE_APP_BASE_API1
   })
 }
+
 // 订单管理  修改发货单接口
 export function updateProductInvoice(data) {
   return request({
@@ -339,7 +344,7 @@ export function saleStorageDetails(id) {
   return request({
     url: '/system/ProductInvoice/saleStorageDetails',
     method: 'get',
-    params: { id },
+    params: {id},
     //baseURL: process.env.VUE_APP_BASE_API1
   })
 }
@@ -353,6 +358,7 @@ export function noticeOutStorage(data) {
     //baseURL: process.env.VUE_APP_BASE_API1
   })
 }
+
 // 销售出库  旧
 export function oldNoticeOutStorage(data) {
   return request({
@@ -372,6 +378,7 @@ export function outboundOrderInfo(data) {
     //baseURL: process.env.VUE_APP_BASE_API1
   })
 }
+
 // 订单管理  打印出库单  获取详情接口    新
 export function printOutsourceOrderList(data) {
   return request({
@@ -383,7 +390,6 @@ export function printOutsourceOrderList(data) {
 }
 
 
-
 // 订单管理  新的获取详情接口
 export function saleOrderList(data) {
   return request({
@@ -393,6 +399,7 @@ export function saleOrderList(data) {
     //baseURL: process.env.VUE_APP_BASE_API1
   })
 }
+
 // 订单管理  获取色号选项数据接口
 export function queryMaterielList(data) {
   return request({
@@ -401,6 +408,7 @@ export function queryMaterielList(data) {
     //baseURL: process.env.VUE_APP_BASE_API1
   })
 }
+
 // 订单管理  新  获取色号选项数据接口
 export function productColourList(data) {
   return request({
@@ -432,7 +440,7 @@ export function getProductSpecificationsByProductName(data) {
   })
 }
 
-// 订单管理   打印出库单  
+// 订单管理 记录批次
 export function printOutsourceOrder(data) {
   return request({
     url: '/system/order/printOutsourceOrder',
@@ -448,4 +456,4 @@ export function againRecordBatch(data) {
     method: 'post',
     data: data,
   })
-}
+}

zkqy-ui/src/views/orderMange/components/dialogForm/OutBound.vue

@@ -212,7 +212,6 @@ export default {
           productName: item.productName,
           productSpecifications: item.productSpecifications,
           productColour: item.productColour,
-          productId: item.productId,
           lotNumber: item.lotNumber,
           weight: item.productNumber,
           productPrice: item.productUnitPrice,

zkqy-ui/src/views/orderMange/outStock/index.vue

@@ -12,29 +12,25 @@
                 :inline="true"
                 size="mini"
               >
-                <el-col :span="10">
-                  <el-form-item label="客户名称:">
-                    <el-input
-                      style="width: 126px"
-                      placeholder="请输入"
-                      clearable
-                      @keyup.enter.native="initData"
-                      v-model="queryParams.customerName"
-                    ></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="10">
-                  <el-form-item label="通知单号:">
-                    <el-input
-                      style="width: 126px"
-                      placeholder="请输入"
-                      clearable
-                      @keyup.enter.native="initData"
-                      v-model="queryParams.noticeNumber"
-                    ></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="4">
+                <el-form-item label="客户名称:">
+                  <el-input
+                    style="width: 126px"
+                    placeholder="请输入"
+                    clearable
+                    @keyup.enter.native="initData"
+                    v-model="queryParams.customerName"
+                  />
+                </el-form-item>
+                <el-form-item label="通知单号:">
+                  <el-input
+                    style="width: 126px"
+                    placeholder="请输入"
+                    clearable
+                    @keyup.enter.native="initData"
+                    v-model="queryParams.noticeNumber"
+                  />
+                </el-form-item>
+                <div style="float: right">
                   <el-form-item>
                     <el-button
                       type="success"
@@ -44,15 +40,10 @@
                       :disabled="loading"
                       >查询
                     </el-button>
-                    <!-- <el-button
-                      type="info"
-                      size="mini"
-                      @click="reSetQueryParams"
-                      icon="el-icon-refresh"
-                      >重置</el-button
-                    > -->
+                    <!-- <el-button type="info" size="mini" @click="reSetQueryParams" icon="el-icon-refresh" >重置</el-button > -->
                   </el-form-item>
-                </el-col>
+                </div>
+                <div style="clear: both" />
               </el-form>
             </el-row>
             <el-table
@@ -70,20 +61,17 @@
                 align="center"
                 prop="customerName"
                 label="客户名称"
-              >
-              </el-table-column>
+              ></el-table-column>
               <el-table-column
                 align="center"
                 prop="noticeNumber"
                 label="通知单号"
-              >
-              </el-table-column>
+              ></el-table-column>
               <el-table-column
                 align="center"
                 prop="noticeDate"
                 label="开单日期"
-              >
-              </el-table-column>
+              ></el-table-column>
             </el-table>
             <pagination
               v-show="total > 0"
@@ -143,9 +131,10 @@
                     {{ form.dispatchNoteRemark }}
                   </el-form-item>
                 </el-col>
-                <el-col :span="12">
+                <el-col :span="8">
                   <el-form-item label="发货日期" prop="deliveryDate">
                     <el-date-picker
+                      style="width: 90%"
                       v-model="form.deliveryDate"
                       type="date"
                       size="mini"
@@ -154,13 +143,9 @@
                     </el-date-picker>
                   </el-form-item>
                 </el-col>
-                <el-col :span="12">
+                <el-col :span="8">
                   <el-form-item label="发货仓库" prop="deliveryWarehouse">
-                    <el-select
-                      v-model="form.deliveryWarehouse"
-                      clearable
-                      filterable
-                    >
+                    <el-select v-model="form.deliveryWarehouse" filterable>
                       <el-option
                         v-for="item in warehouseList"
                         :key="item.id"
@@ -171,11 +156,10 @@
                     </el-select>
                   </el-form-item>
                 </el-col>
-                <el-col :span="12">
+                <el-col :span="8">
                   <el-form-item label="批次" prop="batchNumber">
                     <el-select
                       v-model="form.batchNumber"
-                      clearable
                       filterable
                       @change="batchChangeHandler"
                     >
@@ -206,17 +190,18 @@
                 </el-select>
               </el-form-item>
             </el-col> -->
-                <el-col :span="12">
+                <div style="float: right">
                   <el-form-item>
                     <el-button type="primary" @click="outStockHandler"
-                      >出库
-                    </el-button>
+                      >出库</el-button
+                    >
                     <el-button @click="refreshHandler">刷新</el-button>
                     <el-button type="info" @click="outStockDetailHandler"
                       >出库详情</el-button
                     >
                   </el-form-item>
-                </el-col>
+                </div>
+                <div style="clear: both" />
               </el-form>
             </el-row>
             <el-table
@@ -287,15 +272,15 @@
     </div>
     <el-dialog title="出库详情" :visible.sync="detailVisible" width="1000px">
       <el-descriptions title="通知单信息">
-        <el-descriptions-item label="客户名称">{{
-          currentSaleOrder.customerName
-        }}</el-descriptions-item>
-        <el-descriptions-item label="通知单号">{{
-          currentSaleOrder.noticeNumber
-        }}</el-descriptions-item>
-        <el-descriptions-item label="开单日期">{{
-          currentSaleOrder.noticeDate
-        }}</el-descriptions-item>
+        <el-descriptions-item label="客户名称"
+          >{{ currentSaleOrder.customerName }}
+        </el-descriptions-item>
+        <el-descriptions-item label="通知单号"
+          >{{ currentSaleOrder.noticeNumber }}
+        </el-descriptions-item>
+        <el-descriptions-item label="开单日期"
+          >{{ currentSaleOrder.noticeDate }}
+        </el-descriptions-item>
       </el-descriptions>
       <el-tabs v-model="activeName">
         <el-tab-pane
@@ -333,8 +318,8 @@
                         @click="
                           handleDelete(scope.$index, scope.row, props.row)
                         "
-                        >删除</el-button
-                      >
+                        >删除
+                      </el-button>
                     </template>
                   </el-table-column>
                 </el-table>
@@ -348,7 +333,7 @@
             ></el-table-column>
             <el-table-column label="批号" prop="lotNumber"></el-table-column>
             <el-table-column label="等级" prop="productLevel"></el-table-column>
-            <el-table-column label="单位" prop="unit"> </el-table-column>
+            <el-table-column label="单位" prop="unit"></el-table-column>
             <el-table-column
               label="数量"
               prop="productNumber"
@@ -373,8 +358,8 @@
                   size="mini"
                   type="danger"
                   @click="handleReAcount(scope.row)"
-                  >重新登账</el-button
-                >
+                  >重新登账
+                </el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -711,6 +696,7 @@ export default {
                 return;
               }
               delete payLoad.documentTypeName;
+              if (payLoad.batchNumber == "all") payLoad.batchNumber = null;
               let res = await noticeOutStorage(payLoad);
               if (res.code == 200) {
                 this.$message.success("出库成功");