chenrui %!s(int64=2) %!d(string=hai) anos
pai
achega
54f9b1be52

+ 12 - 1
src/views/salesManagement/salesQuery/chooseCustomModal.vue

@@ -206,7 +206,11 @@ export default {
   name: 'ChooseCustomModal',
   components: { VSelect, CustomerManagementEdit, selectCust, settleStyle },
   props: {
-    show: [Boolean]
+    show: [Boolean],
+    selType: {
+      type: String,
+      default: '0'
+    }
   },
   data () {
     return {
@@ -564,6 +568,13 @@ export default {
         this.getArea('province')
         this.getUserAllList()
       }
+    },
+    selType (val) {
+      if (val == '1') {
+        this.form.distributionFlag = '1'
+      } else {
+        this.form.distributionFlag = '0'
+      }
     }
   }
 }

+ 17 - 3
src/views/salesManagement/salesQuery/list.vue

@@ -80,6 +80,17 @@
                   <a-input id="salesManagementList-purchaseBillNo" v-model.trim="queryParam.purchaseBillNo" allowClear placeholder="请输入采购单号"/>
                 </a-form-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="铺货出库">
+                  <v-select
+                    v-model="queryParam.financialStatus"
+                    ref="financialStatus"
+                    code="FLAG"
+                    id="chooseCustom-distributionFlag"
+                    placeholder="请选择是否铺货出库"
+                    allowClear></v-select>
+                </a-form-item>
+              </a-col>
             </template>
             <a-col :md="6" :sm="24">
               <span class="table-page-search-submitButtons">
@@ -104,7 +115,8 @@
       </div>
       <!-- 操作按钮 -->
       <div class="table-operator">
-        <a-button type="primary" class="button-error" v-if="$hasPermissions('B_salesNews')" @click="handleAdd">新增(零售)</a-button>
+        <a-button type="primary" class="button-error" v-if="$hasPermissions('B_salesNews')" @click="handleAdd('0')">新增(零售)</a-button>
+        <a-button type="primary" class="button-warning" v-if="$hasPermissions('B_salesNews')" @click="handleAdd('1')">新增(铺货)</a-button>
       </div>
       <!-- alert -->
       <a-alert type="info" style="margin-bottom:10px">
@@ -207,7 +219,7 @@
       </s-table>
     </a-spin>
     <!-- 选择客户弹框 -->
-    <choose-custom-modal :show="openModal" @ok="chooseCustomOk" @cancel="openModal=false"></choose-custom-modal>
+    <choose-custom-modal :show="openModal" :selType="selType" @ok="chooseCustomOk" @cancel="openModal=false"></choose-custom-modal>
     <!-- 审核 -->
     <auditModal :openModal="visibleAudit" :spinning="spinningAudit" @close="visibleAudit=false" @ok="auditOrder('WAIT_OUT_WAREHOUSE')" @fail="auditOrder('AUDIT_REJECT')" />
   </a-card>
@@ -266,6 +278,7 @@ export default {
         totalQty: 0,
         totalRecord: 0
       },
+      selType: '0', // 0零售 1铺货
       // 表头
       columns: [
         { title: '序号', dataIndex: 'no', align: 'center', width: '4%' },
@@ -340,7 +353,8 @@ export default {
       }
     },
     // 新增
-    handleAdd () {
+    handleAdd (type) {
+      this.selType = type
       this.openModal = true
     },
     //  审核