zc调整细节

src/views/order/order/order_processing.vue

@@ -254,7 +254,7 @@
         </el-dialog>
 
         <!-- 商品退货弹窗 -->
-        <el-dialog title="商品退货" :visible.sync="salesReturnDialog" width="35%">
+        <el-dialog title="商品退货" :visible.sync="salesReturnDialog" width="45%">
           <div class="salesList">
             <div class="salesTable">
               <el-table ref="table" class="table_box" :data="currentSalesMsg" style="width: 100%" size="mini" highlight-current-row>

src/views/order/order/printOrderDetail.vue

@@ -14,9 +14,9 @@
               <div class="cellMsg"><span>订单编号：</span><span>{{orderDatalist.code}}</span></div>
               <div class="cellMsg"><span>下单日期：</span><span>{{orderDatalist.createdTime}}</span></div>
               <div class="cellMsg"><span>会员名称：</span><span>{{orderDatalist.nickName}}<span v-if="orderDatalist.account">（{{orderDatalist.account}}）</span></span></div>
-              <div class="cellMsg" v-if="logisticsDetail || orderDatalist.deliveryAddressVO"><span>收货人姓名：</span><span>{{logisticsDetail.consigneeName?logisticsDetail.consigneeName:orderDatalist.deliveryAddressVO.recipientName}}</span></div>
-              <div class="cellMsg" v-if="logisticsDetail || orderDatalist.deliveryAddressVO"><span>联系电话：</span><span>{{logisticsDetail.consigneeTelephone?logisticsDetail.consigneeTelephone:orderDatalist.deliveryAddressVO.telephone}}</span></div>
-              <div class="cellMsg" v-if="logisticsDetail || orderDatalist.deliveryAddressVO"><span>收货地址：</span><span>{{logisticsDetail.consigneeAddress?logisticsDetail.consigneeAddress:orderDatalist.deliveryAddressVO.province + orderDatalist.deliveryAddressVO.city + orderDatalist.deliveryAddressVO.area + orderDatalist.deliveryAddressVO.street}}</span></div>
+              <div class="cellMsg" v-if="logisticsDetail || deliveryMessage"><span>收货人姓名：</span><span>{{logisticsDetail.consigneeName?logisticsDetail.consigneeName:deliveryMessage.recipientName}}</span></div>
+              <div class="cellMsg" v-if="logisticsDetail || deliveryMessage"><span>联系电话：</span><span>{{logisticsDetail.consigneeTelephone?logisticsDetail.consigneeTelephone:deliveryMessage.telephone}}</span></div>
+              <div class="cellMsg" v-if="logisticsDetail || deliveryMessage"><span>收货地址：</span><span>{{logisticsDetail.consigneeAddress?logisticsDetail.consigneeAddress:deliveryMessage.province + deliveryMessage.city + deliveryMessage.area + deliveryMessage.street}}</span></div>
               <div class="cellMsg"><span>订单备注：</span><span>{{orderDatalist.nickName}}</span></div>
             </div>
             <div class="msgTable">
@@ -47,7 +47,7 @@
               <div class="cellMsgOther"><span>贷款总金额：</span><span>￥{{Number(totalPrice).toFixed(2)}}</span></div>
               <div class="cellMsgOther"><span>配送费用：</span><span>￥{{orderDatalist.carriage?orderDatalist.carriage.toFixed(2):orderDatalist.carriage}}</span></div>
               <div class="cellMsgOther"><span>实际付款：</span><span>￥{{orderDatalist.carriage?(Number(totalPrice) + Number(orderDatalist.carriage)).toFixed(2):Number(totalNumber).toFixed(2)}}</span></div>
-              <div class="cellMsgOther"><span>配送方式：</span><span>{{logisticsDetail.logisticsType}}</span></div>
+              <div class="cellMsgOther"><span>配送方式：</span><span>{{logisticsDetail.logisticsName}}</span></div>
               <div class="cellMsgOther"><span>发货日期：</span><span>{{orderDatalist.logisticsCreateTime?orderDatalist.logisticsCreateTime:logisticsDetail.logisticsCreateTime}}</span></div>
             </div>
           </div>
@@ -74,6 +74,7 @@ export default {
       id:null,
       totalNumber:null,
       totalPrice:null,
+      deliveryMessage:{},
     }
   },
   mounted() {
@@ -86,6 +87,7 @@ export default {
       orderDetAPI(id).then(res => {
         if(res.data.code == 0){
           this.orderDatalist = res.data.data
+          this.deliveryMessage = res.data.data.deliveryAddressVO
           this.totalNumber = 0
           this.totalPrice = 0
           if(this.orderDatalist.commodityList && this.orderDatalist.commodityList.length > 0){

src/views/resource_manage/special_module/component.vue

@@ -7,7 +7,7 @@
         </div>
         <el-form :model="specialForm" ref="specialForm" :rules="rules" label-position="right" label-width="134px">
           <el-form-item label="专题名称：" prop="name">
-            <el-input v-model="specialForm.name" class="inp" placeholder="建议在14个字以内，最多不超过30个字"></el-input>
+            <el-input v-model="specialForm.name" class="inp" placeholder="建议在14个字以内，最多不超过50个字"></el-input>
           </el-form-item>
           <el-form-item label="封面：" prop="cover" ref="cover">
             <div class="upload_resource">
@@ -121,7 +121,7 @@ export default {
 				name: [
 						{ required:true,message:'请输入专题名称' },
 						{ validator: valValidate },
-						{ max:30,message:'专题名称长度必须小于30位' }
+						{ max:50,message:'专题名称长度必须小于50位' }
 				],
 				sort: [ { required:true,message:'请输入排序号' },{ pattern: sortValidate, message: '请输入0-99999之间的整数'} ],
 				cover: [ { required: true, message: '请上传封面' } ],

src/views/resource_manage/special_module/index.vue

@@ -277,7 +277,17 @@ export default {
     currentChange(val) {
       this.listQuery.pageNum = val
       this.getList()
-    }
+    },
+    resetFilder() {
+      //重置
+      this.listQuery = {
+        pageNum: 1,
+        pageSize: this.listQuery.pageSize,
+        name:null,
+      };
+      this.$refs.table.clearFilter()
+      this.getList();
+    },
   }
 }
 </script>