单据【订单数据】接口联调完成 -------- 仅缺少【同步】按钮功能确定

src/field/document/order.md

@@ -1,4 +1,4 @@
-#### 单证【订单数据】查询页面
+#### 单证【订单数据
 
 ## 查询接口位置：订单主表-分页列表查询
 orderNumber, 订单号
@@ -15,6 +15,7 @@ salesDepartment, 销售部门
 salesman, 业务员
 currencyValue, 币种
 brandSide, 品牌方
+dilivery, 发货状态 （0未发货   1已发货）
 thirdParty, 第三方
 depositRatio, 定金比例
 deposit, 定金

src/views/order/orderList.vue

@@ -34,21 +34,15 @@
               <a-col :md="6" :sm="8">
                 <a-form-item label="账套">
                   <a-input placeholder="请输入账套" v-model="queryParam.account"></a-input>
-                  <!-- <a-select placeholder="请选择账套" v-model="queryParam.account">
-                    <a-select-option :value="''">请选择</a-select-option>
-                    <a-select-option :value="0">香港森语(101)</a-select-option>
-                    <a-select-option :value="1">宁波森语(102)</a-select-option>
-                    <a-select-option :value="2">宁波马菲羊(103)</a-select-option>
-                  </a-select> -->
                 </a-form-item>
               </a-col>
 
               <a-col :md="6" :sm="8">
                 <a-form-item label="发货状态">
-                  <a-select placeholder="请选择发货状态" v-model="queryParam.shippingStatu">
-                    <a-select-option :value="''">请选择</a-select-option>
-                    <a-select-option :value="0">未发货</a-select-option>
-                    <a-select-option :value="1">已发货</a-select-option>
+                  <a-select placeholder="请选择发货状态" v-model="queryParam.dilivery">
+                    <a-select-option value="">请选择</a-select-option>
+                    <a-select-option value="0">未发货</a-select-option>
+                    <a-select-option value="1">已发货</a-select-option>
                   </a-select>
                 </a-form-item>
               </a-col>
@@ -196,6 +190,7 @@ export default {
         orderDate: '',
         customerAbbreviation: '',
         account: '',
+        dilivery: '',
         pageNo: '', // 初始页
         pageSize: '-1' // 每页显示条数
       },
@@ -232,10 +227,10 @@ export default {
     // 查询按钮
     searchQuery() {
       this.getOrderList()
-      console.log('this.queryParam.orderDate', this.queryParam.orderDate)
+      console.log('发货状态', this.queryParam.dilivery)
     },
     searchReset() {
-      console.log('>>>>重置')
+      // console.log('>>>>重置')
       this.queryParam = {}
       this.getOrderList()
     },
@@ -253,8 +248,8 @@ export default {
                 console.log('子表详情', res.result)
                 // 子表信息赋值
                 this.$refs.orderDetailDrawer.childData = res.result
-                 console.log('主表信息', record)
-                 this.$refs.orderDetailDrawer.orderDetail = record
+                console.log('主表信息', record)
+                this.$refs.orderDetailDrawer.orderDetail = record
               }
             })
           }
@@ -264,7 +259,7 @@ export default {
 
     // 查询条件 订单日期转换成字符串并赋值
     onDateChange(value, dateString) {
-      console.log('订单日期', dateString)
+      // console.log('订单日期', dateString)
       this.queryParam.orderDate = dateString
     },
     // 同步

src/views/shipment-details/addShipDetDrawer.vue

@@ -127,8 +127,8 @@
               </template>
 
               <!-- 操作 -->
-              <span slot="operationSlot" slot-scope="text, record">
-                <a-popconfirm title="确定删除吗?" ok-text="是" cancel-text="否" @confirm="handleDelete(record)">
+              <span slot="operationSlot" slot-scope="text, record,index">
+                <a-popconfirm title="确定删除吗?" ok-text="是" cancel-text="否" @confirm="handleDelete(record.index)">
                   <a href="javascript:void(0);" style="color:red;">删除</a>
                 </a-popconfirm>
 
@@ -139,7 +139,7 @@
           </a-form-model>
         </a-spin>
       </a-card>
-      
+
       <!-- 页面底部保存取消 -->
       <div
         :style="{
@@ -434,7 +434,7 @@ export default {
 
   methods: {
     getSon(val) {
-      console.log('val', val)
+      console.log('勾选订单数据', val)
       this.msgFormSon = val
       this.syShippingDetailsItemList = this.msgFormSon
       console.log('新增页 子表信息', this.syShippingDetailsItemList)
@@ -519,8 +519,9 @@ export default {
     },
     // --------------------------------------
     // 操作 删除
-    handleDelete(record) {
-      console.log('删除该项订单数据', record)
+    handleDelete(index) {
+      console.log('index', index)
+      console.log('删除该项订单数据', record.orderNumber)
       return this.syShippingDetailsItemList.splice(record)
     },
     // 操作 复制

src/views/shipment-details/referOrderDataModal.vue

@@ -5,8 +5,7 @@
     :confirmLoading="confirmLoading"
     @ok="onSubmit"
     @cancel="handleCancel"
-    width="86%"
-    style="top:330px;left:100px;"
+    width="76%"
   >
     <!-- tabel 加载 -->
     <a-spin :spinning="confirmLoading">
@@ -22,12 +21,13 @@
 
             <a-col :md="6" :sm="8">
               <a-form-item label="账套">
-                <a-select placeholder="请选择账套" v-model="queryParam.acSetNo">
+                <a-input placeholder="请输入账套" v-model="queryParam.orderNumber"></a-input>
+                <!-- <a-select placeholder="请选择账套" v-model="queryParam.acSetNo">
                   <a-select-option value="">请选择</a-select-option>
                   <a-select-option :value="0">香港森语(101)</a-select-option>
                   <a-select-option :value="1">宁波森语(102)</a-select-option>
                   <a-select-option :value="2">宁波马菲羊(103)</a-select-option>
-                </a-select>
+                </a-select> -->
               </a-form-item>
             </a-col>
 
@@ -45,7 +45,7 @@
         </a-form>
       </div>
 
-      <!-- 勾选表  :row-key="record => record.id"  -->
+      <!-- 勾选表  :row-key="record => record.id" { pageSize: 50 } , y: 800  -->
       <a-table
         bordered
         size="small"
@@ -107,8 +107,8 @@ export default {
         },
         // 账套替换
         {
-          title: '组织',
-          dataIndex: 'pkOrg',
+          title: '账套',
+          dataIndex: 'acSetNo',
           width: 80,
           className: 'replacecolor'
         },
@@ -291,7 +291,7 @@ export default {
         {
           title: '订单变更说明',
           dataIndex: 'orderChangeDescription',
-          width: 180,
+          width: 220,
           customRender: t => ellipsis(t),
           className: 'replacecolor'
         }