lilei 3 лет назад
Родитель
Сommit
bac1f311d8

+ 59 - 0
src/views/common/shelfSettleType.js

@@ -0,0 +1,59 @@
+import { productTypeQuery } from '@/api/productType'
+const ProductType = {
+  template: `
+      <a-cascader
+        @change="handleChange"
+        change-on-select
+        :value="defaultVal"
+        expand-trigger="hover"
+        :options="productTypeList"
+        :fieldNames="{ label: 'productTypeName', value: 'productTypeSn', children: 'children' }"
+        :id="id"
+        placeholder="请选择结算方式"
+        allowClear />
+    `,
+  props: {
+    value: {
+      type: Array,
+      defatut: function () {
+        return []
+      }
+    },
+    id: {
+      type: String,
+      default: ''
+    }
+  },
+  data () {
+    return {
+      defaultVal: this.value,
+      productTypeList: []
+    }
+  },
+  watch: {
+    value (newValue, oldValue) {
+      this.defaultVal = newValue
+    }
+  },
+  mounted () {
+    this.getProductType()
+  },
+  methods: {
+    handleChange (value) {
+      this.defaultVal = value
+      this.$emit('change', this.defaultVal)
+    },
+    //  产品分类列表
+    getProductType () {
+      productTypeQuery({}).then(res => {
+        if (res.status == 200) {
+          this.productTypeList = res.data
+        } else {
+          this.productTypeList = []
+        }
+      })
+    }
+  }
+}
+
+export default ProductType

+ 26 - 9
src/views/numsGoodsShelves/settlementManagement/list.vue

@@ -6,11 +6,28 @@
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
           <a-row :gutter="15">
             <a-col :xl="6" :lg="6" :md="12" :sm="24">
-              <a-form-item label="交易时间">
-                <a-range-picker v-model="time" :format="dateFormat" allowClear :disabledDate="disabledDate" format="YYYY-MM-DD"/>
+              <a-form-item label="货架名称">
+                <shelfList @change="shelfChange"></shelfList>
               </a-form-item>
             </a-col>
-            <a-col :xl="6" :lg="6" :md="6" :sm="6" style="padding-top: 4px;">
+            <a-col :xl="6" :lg="6" :md="12" :sm="24">
+              <a-form-item label="关联客户">
+                <custList @change="custChange"></custList>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="4" :lg="4" :md="12" :sm="24">
+              <a-form-item label="结算方式">
+                <shelfSettType></shelfSettType>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="4" :lg="4" :md="12" :sm="24">
+              <a-form-item label="待结金额">
+                <div style="display: flex;">
+                  <a-input-number/> <span style="margin: 0 10px;">至</span> <a-input-number/>
+                </div>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="4" :lg="4" :md="6" :sm="6">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="outboundOrderList-refresh" >查询</a-button>
               <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="outboundOrderList-reset">重置</a-button>
             </a-col>
@@ -50,8 +67,6 @@
         </template>
       </s-table>
     </a-spin>
-    <!-- 申请提现 -->
-    <!-- <applyWithdrawal :isOpenModal="showModal" :currentData="currentData" @close="showModal=false" @refresh="$refs.table.refresh(true)"></applyWithdrawal> -->
   </a-card>
 </template>
 
@@ -59,9 +74,11 @@
 import { commonMixin } from '@/utils/mixin'
 import moment from 'moment'
 import { STable } from '@/components'
-// import applyWithdrawal from './applyWithdrawal.vue'
+import shelfList from '@/views/common/shelfList.vue'
+import custList from '@/views/common/custList.vue'
+import shelfSettType from '@/views/common/shelfSettleType.js'
 export default {
-  components: { STable, commonMixin },
+  components: { STable, commonMixin, shelfList, custList, shelfSettType },
   data () {
     return {
       spinning: false,
@@ -115,8 +132,8 @@ export default {
     }
   },
   methods: {
-    // 时间改变
-    dateChange (date) {
+    // 选择货架
+    shelfChange (data) {
 
     },
     // 禁止选择今天之后的日期

+ 3 - 3
src/views/numsGoodsShelves/settlementManagement/settlementDetail.vue

@@ -17,8 +17,8 @@
                 </a-form-item>
               </a-col>
               <a-col :xl="6" :lg="6" :md="12" :sm="24">
-                <a-form-item label="支付状态">
-                  <v-select code="ENABLE_FLAG" v-model="form.isEnable" allowClear placeholder="请选择结算方式"></v-select>
+                <a-form-item label="支付方式">
+                  <v-select code="ENABLE_FLAG" v-model="form.isEnable" allowClear placeholder="请选择支付方式"></v-select>
                 </a-form-item>
               </a-col>
               <a-col :xl="6" :lg="6" :md="6" :sm="6" >
@@ -65,7 +65,7 @@ import { STable, VSelect } from '@/components'
 import { getPowerUserList } from '@/api/power-user.js'
 import detailModal from './detailModal.vue'
 export default {
-  components: { STable, VSelect, detailModal,commonMixin },
+  components: { STable, VSelect, detailModal, commonMixin },
   data () {
     return {
       spinning: false,

+ 34 - 2
src/views/numsGoodsShelves/settlementManagement/unSettlementDetail.vue

@@ -7,18 +7,44 @@
           <span style="margin: 0 15px;color: #666;">货架名称:{{ '西安车领主常青二路数字货架' }}</span>
         </template>
       </a-page-header>
+      <!-- 额度统计 授信结算类型 显示-->
+      <a-card size="small" :bordered="false" style="margin-bottom: 10px;">
+        <a-collapse :activeKey="['1']">
+          <a-collapse-panel key="1" header="额度统计">
+            <a-descriptions size="small" :column="4">
+              <a-descriptions-item label="授信额度">
+                <a-statistic :precision="2" :value="112893" ><template #prefix>¥</template></a-statistic>
+              </a-descriptions-item>
+              <a-descriptions-item label="待结金额">
+                <a-statistic :precision="2" :value="112893" ><template #prefix>¥</template></a-statistic>
+              </a-descriptions-item>
+              <a-descriptions-item label="冻结金额">
+                <a-statistic :precision="2" :value="112893" ><template #prefix>¥</template></a-statistic>
+              </a-descriptions-item>
+              <a-descriptions-item label="可用额度">
+                <a-statistic :precision="2" :value="112893" ><template #prefix>¥</template></a-statistic>
+              </a-descriptions-item>
+            </a-descriptions>
+          </a-collapse-panel>
+        </a-collapse>
+      </a-card>
       <a-card :bordered="false" size="small" class="goodsAllocationSet-baseInfo">
         <div ref="tableSearch" class="table-page-search-wrapper">
           <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
             <a-row :gutter="15">
+              <a-col :xl="6" :lg="6" :md="12" :sm="24">
+                <a-form-item label="下单时间">
+                  <a-range-picker v-model="time" :format="dateFormat" allowClear :disabledDate="disabledDate" format="YYYY-MM-DD"/>
+                </a-form-item>
+              </a-col>
               <a-col :xl="6" :lg="6" :md="12" :sm="24">
                 <a-form-item label="取货时间">
                   <a-range-picker v-model="time" :format="dateFormat" allowClear :disabledDate="disabledDate" format="YYYY-MM-DD"/>
                 </a-form-item>
               </a-col>
               <a-col :xl="6" :lg="6" :md="12" :sm="24">
-                <a-form-item label="订单编号">
-                  <a-input placeholder="请输入订单编号"/>
+                <a-form-item label="取货单编号">
+                  <a-input placeholder="请输入取货单编号"/>
                 </a-form-item>
               </a-col>
               <a-col :xl="6" :lg="6" :md="6" :sm="6" >
@@ -28,6 +54,12 @@
             </a-row>
           </a-form>
         </div>
+        <a-alert type="info" style="margin:10px 0">
+          <div slot="message" style="display: flex;align-items: center;padding: 2px 0;">
+            共<strong>25</strong>条记录;
+            待结算金额合计¥<strong>40000.00</strong>
+          </div>
+        </a-alert>
         <s-table
           class="sTable fixPagination"
           ref="table"