lilei 1 year ago
parent
commit
00d4b450b0

+ 0 - 1
src/views/salesManagement/pushOrderManagement/detail.vue

@@ -94,7 +94,6 @@
           <template slot="productCode" slot-scope="text, record">
             <span>{{ text }}</span>
             <a-badge count="促" v-if="record.promotionFlag=='GIFT'" :number-style="{ backgroundColor: '#52c41a', zoom:'80%' }"></a-badge>
-            <!-- <a-badge count="正" v-if="record.promotionFlag=='REGULAR'" :number-style="{ backgroundColor: '#108ee9', zoom:'80%' }"></a-badge> -->
             <a-badge count="特" v-if="record.promotionFlag=='DISCOUNT'" :number-style="{ backgroundColor: '#faad14', zoom:'80%' }"></a-badge>
           </template>
         </s-table>

+ 2 - 2
src/views/salesManagement/pushOrderManagement/sendTypeModal.vue

@@ -42,8 +42,8 @@
         </a-form-model-item>
         <a-form-model-item label="货位编号" prop="orderBy" v-if="nowType=='print'">
           <a-radio-group v-model="form.orderBy">
-            <a-radio value="dispatch_bill_detail.STACK_PLACE_CODE ASC">打印(↑升序)</a-radio>
-            <a-radio value="dispatch_bill_detail.STACK_PLACE_CODE DESC">打印(↓降序)</a-radio>
+            <a-radio value="dispDet.STACK_PLACE_CODE ASC">打印(↑升序)</a-radio>
+            <a-radio value="dispDet.STACK_PLACE_CODE DESC">打印(↓降序)</a-radio>
             <a-radio value="-1">不打印</a-radio>
           </a-radio-group>
         </a-form-model-item>

+ 2 - 2
src/views/salesManagement/stockPrint/sendTypeModal.vue

@@ -42,8 +42,8 @@
         </a-form-model-item>
         <a-form-model-item label="货位编号" prop="orderBy" v-if="nowType=='print'">
           <a-radio-group v-model="form.orderBy">
-            <a-radio value="dispatch_bill_detail.STACK_PLACE_CODE ASC">打印(↑升序)</a-radio>
-            <a-radio value="dispatch_bill_detail.STACK_PLACE_CODE DESC">打印(↓降序)</a-radio>
+            <a-radio value="dispDet.STACK_PLACE_CODE ASC">打印(↑升序)</a-radio>
+            <a-radio value="dispDet.STACK_PLACE_CODE DESC">打印(↓降序)</a-radio>
             <a-radio value="-1">不打印</a-radio>
           </a-radio-group>
         </a-form-model-item>

+ 2 - 2
vue.config.js

@@ -108,9 +108,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.113:8660/ocs-admin',
+        target: 'http://192.168.2.111/ocs-admin',
         // target: 'https://t.ocs.360arrow.com/ocs-admin', //  练习
-        target: 'https://p.ocs.360arrow.com/ocs-admin', //  预发布
+        // target: 'https://p.ocs.360arrow.com/ocs-admin', //  预发布
         ws: false,
         changeOrigin: true,
         pathRewrite: {