添加用户电话号码

src/components/forms.vue

@@ -7,7 +7,8 @@
           <el-form-item class="card_independent" :label-width="item.labelWidth" :label="item.label" :prop="item.field"
             :rules="detail ? item.rules : {}" v-if="item.type === 'input'">
             <el-input :placeholder="item.placeholder" :disabled="item.disabled" :id="item.field"
-              v-model="ruleForm[`${item.field}`]"></el-input>
+              v-model="ruleForm[`${item.field}`]"
+              :show-password="['newPassword','password'].includes(item.field) ? true : false"></el-input>
             <div class="unit_card" v-if="item.unit">{{item.unit}}</div>
           </el-form-item>
           <el-form-item :label-width="item.labelWidth" :label="item.label" :prop="item.field"

src/components/orderDetails.vue

@@ -186,18 +186,20 @@
         return color
       },
       getReceipt(value) {
-        const arr = value.split(',')
-        const arrList = [{
-          title: '运单签收图片',
-          url: arr[0],
-        }, {
-          title: '随货通行单图片',
-          url: arr[1],
-        }, {
-          title: '冷链交接单图片',
-          url: arr[2],
-        }]
-        return arrList
+        if(value){
+          const arr = value.split(',')
+          const arrList = [{
+            title: '运单签收图片',
+            url: arr[0],
+          }, {
+            title: '随货通行单图片',
+            url: arr[1],
+          }, {
+            title: '冷链交接单图片',
+            url: arr[2],
+          }]
+          return arrList
+        }
       },
       mywaybillStatus(value) {
         const list = this.myOrder

src/views/WaybillInquiry.vue

@@ -152,12 +152,15 @@
                   return item.status == i.id;
                 });
                 let yonTitle = ''
+                let phone = ''
                 if (item.car.id) {
                   yonTitle = item.car.carNo
+                  phone = item.car.user.phone
                 } else if (item.warehouse.id) {
                   yonTitle = item.warehouse.name
+                  phone = item.warehouse.user.phone
                 }
-                item.content = item.address + '【' + yonTitle + '】' + '您的货物' + arr[0].title
+                item.content = item.address + '【' + yonTitle + '】' + phone + '  ' + '您的货物' + arr[0].title
                 // await setTimeout(() => {
                 //   this.reverseGeocode(item.lng, item.lat).then(res => {
                 //     const trapeze = res
@@ -165,8 +168,8 @@
                 //   })
                 // }, 1000)
               })
-              this.activitiesList = arrList
-              this.activitiesList[0].field = 'primary'
+              this.activitiesList = arrList.reverse()
+              this.activitiesList[this.activitiesList.length - 1].field = 'primary'
             }
             this.$forceUpdate()
           }

src/views/newInquiry.vue

@@ -156,12 +156,15 @@
                   return item.status == i.id;
                 });
                 let yonTitle = ''
+                let phone = ''
                 if (item.car.id) {
                   yonTitle = item.car.carNo
+                  phone = item.car.user.phone
                 } else if (item.warehouse.id) {
                   yonTitle = item.warehouse.name
+                  phone = item.warehouse.user.phone
                 }
-                item.content = item.address + '【' + yonTitle + '】' + '您的货物' + arr[0].title
+                item.content = item.address + '【' + yonTitle + '】' + phone + '  ' + '您的货物' + arr[0].title
                 // await setTimeout(() => {
                 //   this.reverseGeocode(item.lng, item.lat).then(res => {
                 //     const trapeze = res
@@ -169,8 +172,8 @@
                 //   })
                 // }, 1000)
               })
-              this.activitiesList = arrList
-              this.activitiesList[0].field = 'primary'
+              this.activitiesList = arrList.reverse()
+              this.activitiesList[this.activitiesList.length - 1].field = 'primary'
             }
             this.$forceUpdate()
           }

src/views/system/UserManagement.vue

@@ -84,6 +84,7 @@
           deptId: '',
           name: '',
           username: '',
+          phone: '',
           newPassword: '',
           password: '',
           type: '',
@@ -179,6 +180,7 @@
             var params = {
               id: this.selectingData.id,
               name: this.ruleForm.name,
+              phone: this.ruleForm.phone,
               type: this.ruleForm.type,
             }
             putUser(params).then(res => {
@@ -211,6 +213,7 @@
           setTimeout(() => {
             this.$nextTick(() => {
               this.ruleForm.name = row.nickName
+              this.ruleForm.phone = row.phone
               this.ruleForm.type = row.type
             })
           })

src/views/system/userTable.js

@@ -20,6 +20,10 @@ export const employee = () => {
     align: 'center',
     options: orderStatus()
   }, {
+    field: 'phone',
+    label: '电话号码',
+    align: 'center',
+  }, {
     field: 'action',
     label: '操作',
     colWidth: '260px',
@@ -80,6 +84,17 @@ export const formRules = () => {
       trigger: 'blur'
     }]
   }, {
+    field: 'phone',
+    label: '电话号码',
+    placeholder: '请输入电话号码',
+    type: 'input',
+    colWidth: 24,
+    rules: [{
+      required: true,
+      message: '请输入电话号码',
+      trigger: 'blur'
+    }]
+  }, {
     field: 'newPassword',
     label: '密码',
     placeholder: '请输入密码',
@@ -137,6 +152,17 @@ export const formRulesil = () => {
       trigger: 'blur'
     }]
   }, {
+    field: 'phone',
+    label: '电话号码',
+    placeholder: '请输入电话号码',
+    type: 'input',
+    colWidth: 24,
+    rules: [{
+      required: true,
+      message: '请输入电话号码',
+      trigger: 'blur'
+    }]
+  }, {
     field: 'type',
     label: '客户类型',
     placeholder: '客户类型',