lilei 3 年之前
父節點
當前提交
a6bb2a816e

+ 9 - 0
src/api/sendBill.js

@@ -0,0 +1,9 @@
+import { axios } from '@/utils/request'
+// 发货
+export const sendBillInsert = params => {
+  return axios({
+    url: '/sendBill/insert',
+    data: params,
+    method: 'post'
+  })
+}

+ 8 - 2
src/views/salesManagement/outboundOrder/list.vue

@@ -87,7 +87,7 @@
         size="small"
         :rowKey="(record) => record.stockOutSn"
         rowKeyName="stockOutSn"
-        :row-selection="$hasPermissions('B_stockOut')?{ columnWidth: 40, getCheckboxProps: record => ({ props: { disabled: record.state == 'FINISH' } }) }:null"
+        :row-selection="$hasPermissions('B_stockOut')?{ columnWidth: 40, getCheckboxProps: record => ({ props: { disabled: record.state == 'CANCEL' } }) }:null"
         @rowSelection="rowSelectionFun"
         :columns="columns"
         :data="loadData"
@@ -109,7 +109,12 @@
             class="button-primary"
             @click="handleOutbound(record)"
             id="outboundOrderList-out-btn">出库</a-button>
-          <span v-else>--</span>
+          <a-button
+            size="small"
+            type="link"
+            class="button-primary"
+            @click="handleSendGood(record)"
+            id="outboundOrderList-sendBill">发货</a-button>
         </template>
       </s-table>
     </a-spin>
@@ -146,6 +151,7 @@ import allocationDetailModal from '@/views/allocationManagement/transferOut/deta
 import detailModal from './detailModal.vue'
 import { STable, VSelect } from '@/components'
 import { stockOutList, stockOutOut } from '@/api/stockOut'
+import { sendBillInsert } from '@/api/sendBill'
 export default {
   name: 'OutboundOrderList',
   mixins: [commonMixin],

+ 6 - 6
src/views/salesManagement/waitDispatch/dsModal.vue

@@ -23,7 +23,7 @@
             <span>{{ detailData ? detailData.buyerName : '--' }}</span>
           </a-form-model-item>
           <a-form-model-item label="收货客户名称" extra="如果收货客户和下单客户相同,则不需要选择收货客户名称">
-            <custList ref="custList" @change="custChange"></custList>
+            <dealerSubareaScopeList ref="dealerSubareaScopeList" defValKey="buyerSn" @change="custChange" v-model="form.buyerSn" />
           </a-form-model-item>
           <a-form-model-item label="发货编号" prop="sendNo">
             <a-input
@@ -33,7 +33,7 @@
               placeholder="请输入发货编号"
               allowClear />
             <div style="height: 24px;line-height: normal;">
-              常用:<a-button size="small" type="link" v-for="i in 5">{{ i }}</a-button>
+              常用:<a-button size="small" v-for="i in 5" @click="form.sendNo=i" type="link">{{ i }}</a-button>
             </div>
           </a-form-model-item>
           <a-form-model-item label="备货打印" prop="print">
@@ -48,8 +48,8 @@
           </a-form-model-item>
         </a-form-model>
         <div class="btn-cont">
-          <a-button type="primary" id="dealerAccountEdit-save" @click="handleSave">保存</a-button>
-          <a-button id="dealerAccountEdit-back" @click="isShow = false" style="margin-left: 15px;">取消</a-button>
+          <a-button type="primary" id="dealerAccountEdit-save" @click="handleSave">确定下推</a-button>
+          <a-button id="dealerAccountEdit-back" @click="isShow = false" style="margin-left: 15px;">取消下推</a-button>
         </div>
       </a-spin>
     </div>
@@ -58,12 +58,12 @@
 
 <script>
 import { commonMixin } from '@/utils/mixin'
-import custList from '@/views/common/custList.vue'
+import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
 import { dealerUserSave } from '@/api/dealer'
 export default {
   name: 'DealerAccountEditModal',
   mixins: [commonMixin],
-  components: { custList },
+  components: { dealerSubareaScopeList },
   props: {
     openModal: { //  弹框显示状态
       type: Boolean,

+ 2 - 2
vue.config.js

@@ -107,9 +107,9 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        // target: 'http://192.168.16.102/ocs-admin',
+        target: 'http://192.168.16.102/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: {