页面功能更新

src/views/base/argonPartner-detail.vue

@@ -20,11 +20,11 @@
         <el-form-item label="企业名称" prop="name">
             <el-input v-model="formModel.name" placeholder="请输入企业名称" style="width: 300px"></el-input>
           </el-form-item>
-          <el-form-item label="管理员姓名" prop="contact">
-            <el-input v-model="formModel.contact" placeholder="请输入真实姓名" style="width: 300px"></el-input>
+          <el-form-item label="联系人姓名" prop="contact">
+            <el-input v-model="formModel.contact" placeholder="请输入联系人姓名" style="width: 300px"></el-input>
           </el-form-item>
-          <el-form-item label="管理员电话" prop="phone">
-            <el-input v-model="formModel.phone" placeholder="请输入联系电话" style="width: 300px"></el-input>
+          <el-form-item label="联系人电话" prop="phone">
+            <el-input v-model="formModel.phone" placeholder="请输入联系人电话" style="width: 300px"></el-input>
           </el-form-item>
           <el-form-item label="所在地区" prop="location">
             <el-input v-model="formModel.location" placeholder="请输入所在地区" style="width: 300px"></el-input>
@@ -50,11 +50,11 @@
       return {
           showPwd: true,
           ruleValidate: {
-              userName: [
-              { required: true, message: "用户名不能为空", trigger: "blur" },
+            name: [
+              { required: true, message: "企业名称不能为空", trigger: "blur" },
               ],
-              realName: [
-              { required: true, message: "真实名称不能为空", trigger: "blur" },
+              contact: [
+              { required: true, message: "联系人姓名不能为空", trigger: "blur" },
               ],
               phone: [
               { required: true, message: "联系电话不能为空", trigger: "blur" },

src/views/base/laborerInfo-detail.vue

@@ -17,8 +17,8 @@
           :label-width="'100px'"
           :inline="true"
         >
-        <el-form-item label="企业名称" prop="name">
-            <el-input v-model="formModel.name" placeholder="请输入企业名称" style="width: 300px"></el-input>
+        <el-form-item label="姓名" prop="name">
+            <el-input v-model="formModel.name" placeholder="请输入姓名" style="width: 300px"></el-input>
           </el-form-item>
           <el-form-item label="联系电话" prop="phone">
             <el-input v-model="formModel.phone" placeholder="请输入联系电话" style="width: 300px"></el-input>
@@ -50,11 +50,8 @@
       return {
           showPwd: true,
           ruleValidate: {
-              userName: [
-              { required: true, message: "用户名不能为空", trigger: "blur" },
-              ],
-              realName: [
-              { required: true, message: "真实名称不能为空", trigger: "blur" },
+              name: [
+              { required: true, message: "姓名不能为空", trigger: "blur" },
               ],
               phone: [
               { required: true, message: "联系电话不能为空", trigger: "blur" },
@@ -62,12 +59,6 @@
               idCard: [
               { required: true, message: "身份证号不能为空", trigger: "blur" },
               ],
-              age: [
-              { required: true, message: "年龄不能为空", trigger: "blur" },
-              ],
-              gender: [
-              { required: true, message: "性别不能为空", trigger: "blur" },
-              ],
           },
           roleList: [],
           formModel: {},

src/views/base/transportationInfo-detail.vue

@@ -20,10 +20,10 @@
         <el-form-item label="企业名称" prop="name">
             <el-input v-model="formModel.name" placeholder="请输入企业名称" style="width: 300px"></el-input>
           </el-form-item>
-          <el-form-item label="管理员姓名" prop="contact">
+          <el-form-item label="联系人姓名" prop="contact">
             <el-input v-model="formModel.contact" placeholder="请输入真实姓名" style="width: 300px"></el-input>
           </el-form-item>
-          <el-form-item label="管理员电话" prop="phone">
+          <el-form-item label="联系人电话" prop="phone">
             <el-input v-model="formModel.phone" placeholder="请输入联系电话" style="width: 300px"></el-input>
           </el-form-item>
           <el-form-item label="公司简介" prop="introduction">
@@ -50,11 +50,11 @@
       return {
           showPwd: true,
           ruleValidate: {
-              userName: [
-              { required: true, message: "用户名不能为空", trigger: "blur" },
+              name: [
+              { required: true, message: "企业名称不能为空", trigger: "blur" },
               ],
-              realName: [
-              { required: true, message: "真实名称不能为空", trigger: "blur" },
+              contact: [
+              { required: true, message: "联系人姓名不能为空", trigger: "blur" },
               ],
               phone: [
               { required: true, message: "联系电话不能为空", trigger: "blur" },

src/views/base/workOrder-detail.vue

@@ -261,7 +261,7 @@
             </el-tab-pane>
             <el-tab-pane label="师傅信息" name="third">
                 <div style="margin:30px">
-                    <el-descriptions>
+                    <el-descriptions v-if="technicianInfo!=null">
                         <el-descriptions-item label="姓名">{{technicianInfo.realName}}</el-descriptions-item>
                         <el-descriptions-item label="星级">4.6分</el-descriptions-item>
                         <el-descriptions-item label="已完成单数">50单</el-descriptions-item>
@@ -278,7 +278,7 @@
             </el-tab-pane>
             <el-tab-pane label="施工进度" name="fourth">
                 <div style="margin:50px">
-                  <el-timeline>
+                  <el-timeline >
                     <el-timeline-item :timestamp="item.submitDate" placement="top" v-for="(item,index) in constructionProgressList" :key="index">
                         <h4>{{item.submitByN}} {{item.title}}</h4>
                         <div>
@@ -521,6 +521,7 @@
         }
       })()
         .then((response) => {
+          self.showModal = true;
           var jsonData = response.data;
   
           if (jsonData.result) {
@@ -539,7 +540,7 @@
                   self.fileUrl = image 
               }
   
-              self.showModal = true;
+             
           } else {
             self.$message.error(jsonData.message + "");
           }

src/views/base/workOrder-list.vue

@@ -67,18 +67,7 @@
         <el-table-column  prop="location"  label="所在地区" width="180"></el-table-column>
         <el-table-column  prop="price"  label="报价"></el-table-column>
         <el-table-column  prop="companyName"  label="发起客户"></el-table-column>
-        <el-table-column  prop="status"  label="工单状态">
-            <template slot-scope="{row}">
-                <span v-if="row.status=='0'">未确认</span>
-                <span v-else-if="row.status=='1'">待接单</span>
-                <span v-else-if="row.status=='2'">施工中</span>
-                <span v-else-if="row.status=='3'">待验收</span>
-                <span v-else-if="row.status=='4'">完结待结算</span>
-                <span v-else-if="row.status=='5'">质保中</span>
-                <span v-else-if="row.status=='6'">已出保</span>
-                <span v-else-if="row.status=='7'">已取消</span>
-          </template>
-        </el-table-column>
+        <el-table-column  prop="statusN"  label="工单状态"></el-table-column>
         <el-table-column  prop="payStatus"  label="支付状态">
             <template slot-scope="{row}">
                 <span v-if="row.payStatus=='0'">未支付</span>