lilei 2 năm trước cách đây
mục cha
commit
da02a97f80
2 tập tin đã thay đổi với 18 bổ sung16 xóa
  1. 16 14
      src/views/allocationManagement/transferReturn/editGrp.vue
  2. 2 2
      vue.config.js

+ 16 - 14
src/views/allocationManagement/transferReturn/editGrp.vue

@@ -53,20 +53,28 @@
         <a-collapse :activeKey="['1']">
           <a-collapse-panel key="1" :forceRender="true" header="选择产品">
             <!-- 筛选条件 -->
-            <div class="table-page-search-wrapper">
+            <div class="table-page-search-wrapper" style="display:flex;align-items: center;">
+              <div style="margin-bottom: 10px;padding-right: 20px;">
+                <a-button
+                  type="primary"
+                  class="button-info"
+                  id="salesEdit-plDel-btn"
+                  @click="handleBatchAdd">批量添加</a-button>
+                  <span>已选{{ selectTotal }}项</span>
+              </div>
               <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
                 <a-row :gutter="15">
-                  <a-col :md="5" :sm="24">
+                  <a-col :md="6" :sm="24">
                     <a-form-item label="调拨单号" prop="allocateNo">
                       <a-input id="editGrap-allocateNo" v-model.trim="queryParam.allocateNo" placeholder="请输入调拨单号" allowClear />
                     </a-form-item>
                   </a-col>
-                  <a-col :md="5" :sm="24">
+                  <a-col :md="6" :sm="24">
                     <a-form-item label="产品编码" prop="productCode">
                       <a-input id="editGrap-productCode" v-model.trim="queryParam.productCode" placeholder="请输入产品编码" allowClear />
                     </a-form-item>
                   </a-col>
-                  <a-col :md="5" :sm="24">
+                  <a-col :md="6" :sm="24">
                     <a-form-item label="产品名称" prop="productName">
                       <a-input id="editGrap-productName" v-model.trim="queryParam.productName" placeholder="请输入产品名称" allowClear />
                     </a-form-item>
@@ -75,16 +83,6 @@
                     <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="storeTransferOutList-refresh">查询</a-button>
                     <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="storeTransferOutList-reset">重置</a-button>
                   </a-col>
-                  <a-col :md="5" :sm="24" style="margin-bottom: 10px;text-align: right;">
-                    <span>已选{{ selectTotal }}项</span>
-                    <a-button
-                      style="margin:0 15px;"
-                      size="small"
-                      type="primary"
-                      class="button-info"
-                      id="salesEdit-plDel-btn"
-                      @click="handleBatchAdd">批量添加</a-button>
-                  </a-col>
                 </a-row>
               </a-form>
             </div>
@@ -384,6 +382,8 @@ export default {
           'allocateNo': item.allocateNo,
           'allocateSn': item.allocateSn,
           'oldPrice': item.oldPrice,
+          'cost': row.cost,
+          'returnQty': row.returnQty,
           'price': item.returnPrice,
           'productSn': item.productSn,
           'productCode': item.productCode
@@ -506,6 +506,8 @@ export default {
       const params = {
         allocateReturnSn: this.$route.params.sn,
         productSn: row.productSn,
+        cost: row.cost,
+        returnQty: row.returnQty,
         price: isEdit ? row.price : row.returnPrice,
         allocateNo: row.allocateNo,
         allocateSn: row.allocateSn

+ 2 - 2
vue.config.js

@@ -107,9 +107,9 @@ const vueConfig = {
     // If you want to turn on the proxy, please remosve the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        // target: 'http://192.168.2.117/ocs-admin',
+        target: 'http://192.168.2.111/ocs-admin',
         // target: 'https://t.ocs.360arrow.com/ocs-admin', //  练习
-        target: 'http://p.ocs.360arrow.com/ocs-admin', //  预发布
+        // target: 'http://p.ocs.360arrow.com/ocs-admin', //  预发布
         ws: false,
         changeOrigin: true,
         pathRewrite: {