lilei hace 3 semanas
padre
commit
d550b5bd5b

+ 23 - 18
src/views/salesManagement/pushOrderManagement/list.vue

@@ -41,18 +41,18 @@
                   allowClear></v-select>
               </a-form-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="单据状态">
+                <v-select
+                  v-model="queryParam.voidFlag"
+                  ref="voidFlag"
+                  id="pushOrder-voidFlag"
+                  code="VOID_FLAG"
+                  placeholder="请选择单据状态"
+                  allowClear></v-select>
+              </a-form-item>
+            </a-col>
             <template v-if="advanced">
-              <a-col :md="6" :sm="24">
-                <a-form-item label="单据状态">
-                  <v-select
-                    v-model="queryParam.voidFlag"
-                    ref="voidFlag"
-                    id="pushOrder-voidFlag"
-                    code="VOID_FLAG"
-                    placeholder="请选择单据状态"
-                    allowClear></v-select>
-                </a-form-item>
-              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="备货打印状态">
                   <v-select
@@ -98,9 +98,9 @@
               <a-col :md="6" :sm="24">
                 <a-form-item label="新客户首笔订单">
                   <v-select
-                    v-model="queryParam.firstFlag"
-                    ref="firstFlag"
-                    id="pushOrder-firstFlag"
+                    v-model="queryParam.newCustFlag"
+                    ref="newCustFlag"
+                    id="pushOrder-newCustFlag"
                     code="FLAG"
                     placeholder="请选择是否新客户首笔订单"
                     allowClear></v-select>
@@ -138,7 +138,7 @@
           :rowKey="(record) => record.id"
           :columns="columns"
           :data="loadData"
-          :scroll="{ y:tableHeight, x:1890 }"
+          :scroll="{ y:tableHeight, x:1900 }"
           :defaultLoadData="false"
           bordered>
           <!-- 销售单号 -->
@@ -148,8 +148,11 @@
           </template>
           <!-- 备货单号 -->
           <template slot="dispatchBillNo" slot-scope="text, record">
-            <span class="link-bule" v-if="$hasPermissions('B_dispatchDetail')" @click="handleDetail(record,1)">{{ record.dispatchBillNo }}</span>
+            <span class="link-bule" v-if="$hasPermissions('B_dispatchDetail')" @click="handleDetail(record,1)">
+              {{ record.dispatchBillNo }}
+            </span>
             <span v-else>{{ record.dispatchBillNo }}</span>
+            <a-tag v-if="record.newCustFlag==1">新</a-tag>
           </template>
           <!-- 发货说明  -->
           <template slot="explainInfo" slot-scope="text, record">
@@ -257,7 +260,8 @@ export default {
         printStatus: undefined, // 备货打印状态
         checkStatus: undefined, // 对单状态
         warehouseSn: undefined, // 仓库
-        bizUserSn: undefined // 客服
+        bizUserSn: undefined, // 客服
+        newCustFlag: undefined
       },
       totalData: { // 统计数据
         totalAmount: 0, // 总金额
@@ -296,7 +300,7 @@ export default {
         { title: '序号', dataIndex: 'no', width: '60px', align: 'center' },
         { title: '下推时间', dataIndex: 'pushedDate', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, width: '120px', align: 'center' },
-        { title: '备货单号', scopedSlots: { customRender: 'dispatchBillNo' }, width: '120px', align: 'center' },
+        { title: '备货单号', scopedSlots: { customRender: 'dispatchBillNo' }, width: '130px', align: 'center' },
         { title: '发货编号', dataIndex: 'sendNo', width: '80px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '发货说明', scopedSlots: { customRender: 'explainInfo' }, width: '150px', align: 'center', ellipsis: true },
         { title: '客户名称', dataIndex: 'buyerName', width: '150px', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
@@ -405,6 +409,7 @@ export default {
       this.queryParam.checkStatus = undefined
       this.queryParam.warehouseSn = undefined
       this.queryParam.bizUserSn = undefined
+      this.queryParam.newCustFlag = undefined
 
       if (this.advanced) {
         this.$refs.subarea.clearData()

+ 7 - 7
src/views/salesManagement/waitDispatchNew/dsModal.vue

@@ -77,12 +77,12 @@
               </a-radio>
             </a-radio-group>
           </a-form-model-item>
-          <a-form-model-item label="新客户首笔订单" prop="firstFlag">
-            <a-radio-group v-model="form.firstFlag" id="dsModal-firstFlag">
-              <a-radio value="1" id="dsModal-firstFlag-1">
+          <a-form-model-item label="新客户首笔订单" prop="newCustFlag">
+            <a-radio-group v-model="form.newCustFlag" id="dsModal-newCustFlag">
+              <a-radio value="1" id="dsModal-newCustFlag-1">
               </a-radio>
-              <a-radio value="0" id="dsModal-firstFlag-2">
+              <a-radio value="0" id="dsModal-newCustFlag-2">
               </a-radio>
             </a-radio-group>
@@ -134,12 +134,12 @@ export default {
         receiverName: '', // 收货客户名称
         dealerRecevieAddressSn: '', // 地址sn
         explainInfo: '', // 备注
-        firstFlag: undefined // 新客户首笔订单
+        newCustFlag: undefined // 新客户首笔订单
       },
       rules: {
         sendNo: [{ required: true, message: '请输入发货编号', trigger: 'change' }],
         printStatus: [{ required: true, message: '请选择备货打印', trigger: 'change' }],
-        firstFlag: [{ required: true, message: '请选择是否新客户首笔订单', trigger: 'change' }],
+        newCustFlag: [{ required: true, message: '请选择是否新客户首笔订单', trigger: 'change' }],
         dealerRecevieAddressSn: [ { required: true, message: '请选择收货地址', trigger: 'change' } ]
       },
       detailData: null, //  详情数据
@@ -241,7 +241,7 @@ export default {
         receiverName: '',
         dealerRecevieAddressSn: '',
         explainInfo: '',
-        firstFlag: undefined
+        newCustFlag: undefined
       }
       if (!this.receiverDisabled) {
         this.$refs.dealerSubareaScopeList.resetForm()