移动订单需求修改

ccf9c10e · 陈浩建 · 3422b9ed · ccf9c10e · ccf9c10e · ccf9c10e
Commit ccf9c10e authored Jul 29, 2021 by 陈浩建
4 changed files
--- a/src/views/school-center/order/order.vue
+++ b/src/views/school-center/order/order.vue
@@ -143,6 +143,7 @@
                :locale="emptyText">
            <!--拦截器-->
            <template slot="productLastUpdateTime" slot-scope="text">{{ text | dayjs}}</template>
+            <template slot="createtime" slot-scope="text" >{{ text | dayjs}}</template>
            <!--拦截器-->
            <template slot="productCreateTime" slot-scope="text">{{ text | dayjs}}</template>
            <template slot="text" slot-scope="text">
@@ -273,13 +274,28 @@
                  </a-col>
                </a-row>
                <a-row>
+                  <a-col :span="6">
-                  <a-col :span="12">
+                    <a-form-item label="配送类型：">
-                    <a-form-item label="备注：">
+                      <p>{{ orderInfo.isDelivery }}</p>
-                      <p>{{ orderInfo.remarks }}</p>
+                    </a-form-item>
+                  </a-col>
+                  <a-col :span="6">
+                    <a-form-item label="快递公司：">
+                      <p>{{ orderInfo.company }}</p>
+                    </a-form-item>
+                  </a-col>
+                  <a-col :span="6">
+                    <a-form-item label="快递单号：">
+                      <p>{{ orderInfo.kuaidiOrder }}</p>
+                    </a-form-item>
+                  </a-col>
+                  <a-col :span="6">
+                    <a-form-item label="导入快递时间：">
+                      <p>{{ orderInfo.kuaidiTime | dayjs }}</p>
                    </a-form-item>
                  </a-col>
                </a-row>
                <a-row>
                  <a-col :span="6">
                    <a-form-item label="学生证审核状态：">
@@ -303,6 +319,13 @@
                    </a-form-item>
                  </a-col>
                </a-row>
+                <a-row>
+                  <a-col :span="6">
+                    <a-form-item label="备注：">
+                      <p>{{ orderInfo.remarks }}</p>
+                    </a-form-item>
+                  </a-col>
+                </a-row>
                <a-divider orientation="left">附件</a-divider>
                <div v-show="!imgShow">无附件</div>
                <div v-show="imgShow" style="margin-bottom: 50px">
@@ -478,7 +501,7 @@
            <div>
                <a-radio-group v-model="reviewSendType.sendType" @change="changeSendType">
                  <a-radio value="快递">快递</a-radio>
-                  <a-radio value="送货上门">送货上门</a-radio>
+<!--                  <a-radio value="送货上门">送货上门</a-radio>-->
                </a-radio-group>
            </div>
        </a-modal>
@@ -903,28 +926,30 @@
                orderInfo: {},
                columns: [
                    {dataIndex: "customerName", width: 100, title: "客户姓名", fixed: "left"},
-                    {dataIndex: "orderStatus", width: 80, title: "订单状态", fixed: "left"},
+                    {dataIndex: "businessNumber", width: 120, title: "办理号码", fixed: "left"},
+                    {dataIndex: "orderStatus", width: 80, title: "订单状态"},
+                    {dataIndex: 'createTime',width:150, sort: true, title: '订单创建时间', scopedSlots: { customRender: 'createtime' } },
+                    {dataIndex: "hehuorenSchool", width: 200, title: "合伙人学校"},
+                    {dataIndex: "hehuorenName", width: 90, title: "合伙人姓名"},
+                    {dataIndex: "hehuorenPhone", width: 120, title: "合伙人手机"},
+                    {dataIndex: "supervisorName", width: 120, title: "督导"},
                    {
                      dataIndex: "userType",
                      width: 100,
                      title: "订单类型",
                      scopedSlots: {customRender: "userType"}
                    },
-                    {dataIndex: "businessNumber", width: 120, title: "办理号码"},
+                    {dataIndex: "kapin", width: 220, title: "办理套餐"},
+                    {dataIndex: "businessPackage", width: 220, title: "升级套餐"},
                    {dataIndex: "contactNumber", width: 120, title: "联系号码"},
-                    {dataIndex: "kapin", width: 160, title: "办理套餐"},
-                    {dataIndex: "hehuorenSchool", width: 200, title: "合伙人学校"},
-                    {dataIndex: "hehuorenName", width: 90, title: "合伙人姓名"},
-                    {dataIndex: "hehuorenPhone", width: 120, title: "合伙人手机"},
-                    {
-                        dataIndex: "studentCardCheckStatus",
-                        width: 100,
-                        title: "学生证状态",
-                        scopedSlots: {customRender: "studentCardCheckStatus"}
-                    },
-                    {dataIndex: "businessPackage", width: 120, title: "升级套餐"},
                    {dataIndex: "orderNumber", width: 200, title: "订单编号"},
+                    {dataIndex: "xbOrderId", width: 200, title: "小白卡单号"},
+                    // {
+                    //     dataIndex: "studentCardCheckStatus",
+                    //     width: 100,
+                    //     title: "学生证状态",
+                    //     scopedSlots: {customRender: "studentCardCheckStatus"}
+                    // },
                    {
                        dataIndex: "operation",
                        width: 180,
@@ -1372,6 +1397,7 @@
                    createTime: "",
                    address: "",
                    site: "",
+                    isDelivery :"",
                    remarks: "",
                    checkFail: "",
                    expenses: "",
@@ -1382,6 +1408,7 @@
                    giftPassword: "",
                    kuaidiOrder: "",
                    company: "",
+                    kuaidiTime:"",
                    studentCardCheckStatus: "",
                    kdOrderId: "",
                    orderStatus: "",
@@ -1436,6 +1463,7 @@
                    address: data.address,
                    site: data.site,
                    remarks: data.remarks,
+                    isDelivery: this.typeStatus(data.isDelivery),
                    checkFail: data.checkFail,
                    expenses: data.expenses,
                    identifying: data.identifying,
@@ -1445,6 +1473,7 @@
                    giftPassword: data.giftPassword,
                    kuaidiOrder: data.kuaidiOrder,
                    company: data.company,
+                    kuaidiTime:data.kuaidiTime,
                    studentCardCheckStatus: data.studentCardCheckStatus,
                    kdOrderId: data.kdOrderId,
                    orderStatus: data.orderStatus,
@@ -1528,6 +1557,13 @@
            openKuaiDi(){
            },
+            typeStatus(data){
+              if(data === "1"){
+                return "省仓配送"
+              }else if(data === "2"){
+                return "本地配送"
+              }
+            }
        }
    };
 </script>

--- a/src/views/school-center/productManagement/package.vue
+++ b/src/views/school-center/productManagement/package.vue
@@ -63,11 +63,17 @@
                    </a-auto-complete>
                </a-form-item>
                <a-form-item :labelCol="{span: 6}" :wrapperCol="{span: 8, offset: 1}" label="卡品类型">
-                    <a-radio-group  v-decorator="['isXbCard']"  :defaultValue="0">
+                    <a-radio-group  v-decorator="['isXbCard']" :defaultValue="0" @change="onchangeXB">
                        <a-radio :value="0">小白卡</a-radio>
                        <a-radio :value="1">预制卡</a-radio>
                    </a-radio-group>
                </a-form-item>
+                <a-form-item v-show="modifyForm.isXbCard===0" :labelCol="{span: 6}" :wrapperCol="{span: 8, offset: 1}" label="配送方式">
+                    <a-radio-group v-decorator="['isDelivery']" :defaultValue="1">
+                        <a-radio :value="1">省仓配送</a-radio>
+                        <a-radio :value="2">本地配送</a-radio>
+                    </a-radio-group>
+                </a-form-item>
                <a-form-item :labelCol="{span: 6}" :wrapperCol="{span: 8, offset: 1}" label="月基本费用">
                    <a-input placeholder="月基本费用" v-decorator="[ 'monthFee', {rules: [{ required: true, message: '月基本费用不能为空！' ,whitespace:true}]} ]"></a-input>
                </a-form-item>
@@ -154,6 +160,7 @@
        },
        data: function () {
            return {
+              radioValue: 0,
                emptyText: {emptyText: '暂无数据'},
                header:{
                    "Authorization":Vue.ls.get(ACCESS_TOKEN)
@@ -168,7 +175,6 @@
                previewVisiblexiaotu: false,
                previewImagexiaotu: '',
                fileListxiaotu:[],
                fileid:{},
                brackgroundurl:"manager/ciop/packageManagement/package/backgroundUpload",
                xiaotuurl:"manager/ciop/packageManagement/package/xiaotuUpload",
@@ -179,7 +185,8 @@
                    id:"",
                    packageName:"",
                    name:"",
-                    isXbCard:"",
+                    isXbCard:1,
+                    isDelivery:"",
                    monthFee:"",
                    flow:"",
                    voice:"",
@@ -325,25 +332,24 @@
            },
            add(){
                this.fileid={id:""}
-                this.modifyvisible=true
                this.modifyForm.id=""
                this.titleName="添加"
+                this.modifyForm.isXbCard = 0
                packageAllList().then(res=>{
                    if (res.state=="success"){
                        this.autoCompleteResult=res.data
                    }
                })
-                setTimeout(()=>{
+                setTimeout(()=>{this.Formtable.setFieldsValue({isXbCard:0,})},0)
-                    this.Formtable.setFieldsValue({
+                this.modifyvisible=true
-                        isXbCard:0,
-                    })
-                },0)
            },
            modifyfunction(data){
+              console.log(data)
                this.modifyForm.id=data.id
                this.fileid={
                    id:data.id
                }
                if (!(data.advImg == null || data.advImg=="")) {
                  let url = this.baseuploadUrl()+"app/ciop"+data.advImg.replace("enclosure","ciop")
                    //下载图片浏览
@@ -365,13 +371,17 @@
                        url: xiaotuurl,
                    })
                }
+                // 判断配送方式是否为空
+                if (data.isDelivery == null) {
+                  data.isDelivery = "";
+                }
                this.titleName="编辑"
-                this.modifyvisible=true
                setTimeout(()=>{
                    this.Formtable.setFieldsValue({
                        packageName:data.packageName,
                        name:data.name,
                        isXbCard:data.isXbCard,
+                        isDelivery:data.isDelivery,
                        monthFee:data.monthFee,
                        flow:data.flow,
                        voice:data.voice,
@@ -385,14 +395,20 @@
                        this.autoCompleteResult=res.data
                    }
                })
+                this.modifyForm.isXbCard = data.isXbCard
+                this.modifyvisible=true
+            },
+            onchangeXB(data){
+              this.modifyForm.isXbCard = data.target.value
            },
            //提交表单
            createfunctionOk(){
-                this.Formtable.validateFields(['packageName', 'name',"isXbCard","monthFee", 'flow',"voice", 'xbId',"warmTip" ,'explains'], {force: true}, (err, values)=>{
+                this.Formtable.validateFields(['packageName', 'name',"isXbCard","isDelivery","monthFee", 'flow',"voice", 'xbId',"warmTip" ,'explains'], {force: true}, (err, values)=>{
                    if (!err){
                        this.modifyForm.packageName=values.packageName
                        this.modifyForm.name=values.name
                        this.modifyForm.isXbCard=values.isXbCard
+                        this.modifyForm.isDelivery=values.isDelivery
                        this.modifyForm.monthFee=values.monthFee
                        this.modifyForm.flow=values.flow
                        this.modifyForm.voice=values.voice
@@ -407,7 +423,6 @@
                        if (this.previewImagexiaotu != undefined) {
                          this.modifyForm.smallImgBase64 = this.previewImagexiaotu;
                        }
                        //插入数据
                        if (this.modifyForm.id==""){
                            insert(this.modifyForm).then(res=>{
@@ -444,6 +459,7 @@
                    packageName:"",
                    name:"",
                    isXbCard:0,
+                    isDelivery:"",
                    monthFee:"",
                    flow:"",
                    voice:"",

--- a/src/views/school-center/schoolmanager/schoolmanagement.vue
+++ b/src/views/school-center/schoolmanager/schoolmanagement.vue
@@ -566,7 +566,6 @@
                }else{
                    this.fileList = obj.fileList;
                }
            },
            delet(deletdata){
                let status=0;

--- a/src/views/school-center/userManager/newUser.vue
+++ b/src/views/school-center/userManager/newUser.vue
@@ -7,7 +7,7 @@
                <a-row :gutter="24">
                    <a-col :md="3" :sm="6">
                        <a-form-item label="账号">
-                            <a-input placeholder="账号" v-model="queryParam.account" style="width: 8rem;"></a-input>
+                            <a-input placeholder="账号" v-model="queryParam.account" style="width: 5rem;"></a-input>
                        </a-form-item>
                    </a-col>
                    <a-col :md="3" :sm="6">
@@ -26,7 +26,7 @@
                    </a-col>
                    <a-col :md="5" :sm="10">
                        <a-form-item label="学校">
-                            <a-select v-model="queryParam.salesSchool" style="width: 15rem;">
+                            <a-select v-model="queryParam.salesSchool" style="width: 10rem;">
                                <a-select-option key="">--全部--</a-select-option>
                                <a-select-option v-for="d in schoolNames" :key="d.value" :value="d.value">{{d.text}}
                                </a-select-option>