chenrui 4 năm trước cách đây
mục cha
commit
24b05b6de7

+ 8 - 1
src/views/equipmentManage/network/detailsModal.vue

@@ -35,6 +35,12 @@
           <p class="item-main">上下班高峰期投放</p>
         </a-col>
       </a-row>
+      <a-row :gutter="35">
+        <a-col :span="24" class="item-cont">
+          <p class="item-label">兑换规则:</p>
+          <p class="item-main">兑换规兑换规则兑换规则兑换规则兑换规则兑换规则兑换规则兑换规则兑换规则兑换规则兑换规则兑换规则兑换规则兑换规则兑换规则兑换规则兑换规则兑换规则兑换规则兑换规则兑换规则兑换规则兑换规则兑换规则兑换规则兑换规则兑换规则兑换规则兑换规则兑换规则兑换规则兑换规则兑换规则兑换规则兑换规则兑换规则兑换规则兑换规则兑换规则则</p>
+        </a-col>
+      </a-row>
     </div>
     <a-divider />
     <!-- 已绑设备 -->
@@ -75,10 +81,11 @@ export default {
         { title: '设备编号', dataIndex: 'equipmentNo', width: 200, align: 'center' },
         { title: '设备状态', dataIndex: 'equipmentStatus', width: 200, align: 'center' },
         { title: '投放情况', dataIndex: 'situation', width: 200, align: 'center' },
+        { title: '工作状态', dataIndex: 'workStatus', width: 200, align: 'center' },
         { title: '箱体类型', dataIndex: 'type', width: 200, align: 'center' }
       ],
       equipmentData: [
-        { id: 1, no: 1, equipmentNo: 'hgd13612875712', equipmentStatus: '1', situation: '41%-12%-21%-0%', type: '咸阳二代箱体' }
+        { id: 1, no: 1, equipmentNo: 'hgd13612875712', equipmentStatus: '1', situation: '41%-12%-21%-0%', workStatus: 1, type: '咸阳二代箱体' }
       ]
     }
   },

+ 19 - 1
src/views/equipmentManage/network/editModal.vue

@@ -85,6 +85,22 @@
           </a>
         </a-col>
       </a-row>
+      <a-form-item label="选择兑换规则" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
+        <a-select
+          allowClear
+          v-decorator="[
+            'formData.exchangeRules',
+            { initialValue: formData.exchangeRules,
+              rules: [{ required: true, message: '请选择投递时间段' }] },
+          ]"
+          placeholder="请选择投递时间段"
+          @change="exchangeRulesChange"
+        >
+          <a-select-option v-for="(item,index) in deliverList" :key="index" :value="item.value">
+            {{ item.value }}
+          </a-select-option>
+        </a-select>
+      </a-form-item>
       <a-form-item label="投递时间段" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
         <a-select
           allowClear
@@ -164,7 +180,9 @@ export default {
     //  投递时间段  change
     deliverChange (val) {
 
-    }
+    },
+    //  兑换规则  change
+    exchangeRulesChange (val) {}
   },
   watch: {
     //  父页面传过来的弹框状态

+ 13 - 18
src/views/equipmentManage/network/network.vue

@@ -60,7 +60,7 @@
         <a-icon type="eye" id="network-handleView" title="详情" class="actionBtn icon-green" @click="handleView(record)" />
         <a-icon type="edit" id="network-handleEdit" title="编辑" class="actionBtn icon-blues" @click="handleEdit(record)" />
         <a-badge count="5">
-          <a-icon type="link" id="network-handleLink" title="关联箱体设备" class="actionBtn icon-orange" @click="handleBind(record)" />
+          <a-icon type="link" id="network-handleLink" title="绑定箱体设备" class="actionBtn icon-orange" @click="handleBind(record)" />
         </a-badge>
       </template>
     </s-table>
@@ -110,6 +110,7 @@ export default {
         { title: '市', dataIndex: 'cityName', width: 200, align: 'center' },
         { title: '区', dataIndex: 'areaName', width: 200, align: 'center' },
         { title: '详细地址', dataIndex: 'address', width: 200, align: 'center' },
+        { title: '兑换规则', dataIndex: 'exchangeRules', width: 200, align: 'center' },
         { title: '投放时间段名称', dataIndex: 'times', width: 220, align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 240, align: 'center' }
       ],
@@ -128,22 +129,19 @@ export default {
         // })
         return new Promise((resolve) => {
           const data = [
-            { id: 1, no: 1, orderDate: '2020-10-30 09:14', networkName: '网点1', provinceName: '陕西省', cityName: '西安市', areaName: '未央区', address: '凤城十二路', times: '早高峰期' },
-            { id: 2, no: 2, orderDate: '2020-10-30 09:14', networkName: '网点2', provinceName: '陕西省', cityName: '西安市', areaName: '未央区', address: '凤城十二路', times: '晚高峰期' },
-            { id: 3, no: 3, orderDate: '2020-10-30 09:14', networkName: '网点3', provinceName: '陕西省', cityName: '西安市', areaName: '未央区', address: '凤城十二路', times: '早高峰期' },
-            { id: 4, no: 4, orderDate: '2020-10-30 09:14', networkName: '网点4', provinceName: '陕西省', cityName: '西安市', areaName: '未央区', address: '凤城十二路', times: '早高峰期' },
-            { id: 5, no: 5, orderDate: '2020-10-30 09:14', networkName: '网点5', provinceName: '陕西省', cityName: '西安市', areaName: '未央区', address: '凤城十二路', times: '早高峰期' },
-            { id: 6, no: 6, orderDate: '2020-10-30 09:14', networkName: '网点6', provinceName: '陕西省', cityName: '西安市', areaName: '未央区', address: '凤城十二路', times: '早高峰期' },
-            { id: 7, no: 7, orderDate: '2020-10-30 09:14', networkName: '网点7', provinceName: '陕西省', cityName: '西安市', areaName: '未央区', address: '凤城十二路', times: '早高峰期' }
+            { id: 1, no: 1, orderDate: '2020-10-30 09:14', networkName: '网点1', provinceName: '陕西省', cityName: '西安市', areaName: '未央区', address: '凤城十二路', exchangeRules: '规则1', times: '早高峰期' },
+            { id: 2, no: 2, orderDate: '2020-10-30 09:14', networkName: '网点2', provinceName: '陕西省', cityName: '西安市', areaName: '未央区', address: '凤城十二路', exchangeRules: '规则2', times: '晚高峰期' },
+            { id: 3, no: 3, orderDate: '2020-10-30 09:14', networkName: '网点3', provinceName: '陕西省', cityName: '西安市', areaName: '未央区', address: '凤城十二路', exchangeRules: '规则3', times: '早高峰期' },
+            { id: 4, no: 4, orderDate: '2020-10-30 09:14', networkName: '网点4', provinceName: '陕西省', cityName: '西安市', areaName: '未央区', address: '凤城十二路', exchangeRules: '规则4', times: '早高峰期' },
+            { id: 5, no: 5, orderDate: '2020-10-30 09:14', networkName: '网点5', provinceName: '陕西省', cityName: '西安市', areaName: '未央区', address: '凤城十二路', exchangeRules: '规则5', times: '早高峰期' },
+            { id: 6, no: 6, orderDate: '2020-10-30 09:14', networkName: '网点6', provinceName: '陕西省', cityName: '西安市', areaName: '未央区', address: '凤城十二路', exchangeRules: '规则6', times: '早高峰期' },
+            { id: 7, no: 7, orderDate: '2020-10-30 09:14', networkName: '网点7', provinceName: '陕西省', cityName: '西安市', areaName: '未央区', address: '凤城十二路', exchangeRules: '规则7', times: '早高峰期' }
           ]
           resolve(data)
         })
       },
       // 将默认当天时间日期回显在时间选择框中
-      time: [
-        moment(getDate.getToday().starttime, this.dateFormat),
-        moment(getDate.getToday().endtime, this.dateFormat)
-      ],
+      time: [],
       dateFormat: 'YYYY-MM-DD',
       options: addrData, //  省市区下拉数据
       areas: [], //  省市区 值
@@ -175,12 +173,9 @@ export default {
     // 重置
     handleReset () {
       console.log('重置', this.queryParam)
-      this.queryParam.beginDate = getDate.getToday().starttime
-      this.queryParam.endDate = getDate.getToday().endtime
-      this.time = [
-        moment(getDate.getToday().starttime, this.dateFormat),
-        moment(getDate.getToday().endtime, this.dateFormat)
-      ]
+      this.queryParam.beginDate = null
+      this.queryParam.endDate = null
+      this.time = []
       this.areas = []
       this.form.resetFields()
       this.$refs.table.refresh(true)