修改获取字段名

src/views/deposit_commerce/components/deposit_list-detail.vue

@@ -722,8 +722,8 @@
             min-width="160"
             show-overflow-tooltip
           >
-              <template slot-scope="scope">
-                {{ scope.row.price | numToFixed}}
+            <template slot-scope="scope">
+              {{ scope.row.price | numToFixed}}
             </template>
           </el-table-column>
           <el-table-column
@@ -776,7 +776,7 @@
              <el-table-column
               align="left"
               label="验收人"
-              prop="checkBy"
+              prop="checkName"
               min-width="160"
               show-overflow-tooltip
             >
@@ -809,7 +809,7 @@
               show-overflow-tooltip
             >
                 <template slot-scope="scope">
-              {{scope.row.checkNote?'是':'否'}}
+              {{scope.row.isRefundDeposit?'是':'否'}}
               </template>
             </el-table-column>
                 <el-table-column

src/views/deposit_commerce/components/refund_list-detail.vue

@@ -306,11 +306,11 @@
       <el-row :gutter="0">
         <el-col :xs="12" :sm="12" :lg="12" class="item">
           <div class="label">申请人</div>
-          <div class="value">{{ detailList.createBy }}</div>
+          <div class="value">{{ detailList.submitName }}</div>
         </el-col>
         <el-col :xs="12" :sm="12" :lg="12" class="item">
           <div class="label">申请日期</div>
-          <div class="value">{{ detailList.createTime }}</div>
+          <div class="value">{{ detailList.submitTime }}</div>
         </el-col>
         <el-col :xs="12" :sm="24" :lg="24" class="item">
           <div class="label">申请退押金</div>
@@ -325,12 +325,11 @@
     <div class="mymain-container">
       <div class="table">
         <el-table v-loading="listLoading" :data="detailList.checkRecordItems" element-loading-text="Loading" border fit highlight-current-row stripe>
-          <el-table-column align="left" label="申请人" prop="submitBy" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="申请人" prop="submitName" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="left" label="申请日期" prop="submitTime" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="left" label="申请说明" prop="applyNote" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="验收人" prop="checkBy" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="验收人" prop="checkName" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="left" label="受理日期" prop="checkDate" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="是否退押" prop="checkBy" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="left" label="验收说明" prop="checkNote" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="left" label="审批结果" prop="isRefundDeposit" min-width="160" show-overflow-tooltip>
             <template slot-scope="scope">

src/views/deposit_commerce/refund_list.vue

@@ -323,10 +323,10 @@
 
             <el-table-column align="right" label="安装日期" prop="installDate" min-width="160" show-overflow-tooltip>
             </el-table-column>
-            <el-table-column align="left" label="审核人" prop="confirmBy" min-width="160" show-overflow-tooltip>
+            <el-table-column align="left" label="审核人" prop="confirmName" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.confirmBy" />
-                <span>{{scope.row.confirmBy}}</span>
+                <CopyButton :copyText="scope.row.confirmName" />
+                <span>{{scope.row.confirmName}}</span>
               </template>
             </el-table-column>
 

src/views/deposit_home/components/deposit_list-detail.vue

@@ -1,15 +1,15 @@
 <template>
   <div>
     <div class="sty">
-      <el-page-header content="详情" @back="goBack" />
+      <el-page-header content="详情" @back="goBack"/>
     </div>
-    <el-divider />
+    <el-divider/>
     <el-radio-group v-model="engineering" size="mini" @change="handleRadio">
-      <el-radio-button label="工程押金信息" />
-      <el-radio-button label="工程订单信息" />
-      <el-radio-button label="工程发货信息" />
+      <el-radio-button label="工程押金信息"/>
+      <el-radio-button label="工程订单信息"/>
+      <el-radio-button label="工程发货信息"/>
       <!-- <el-radio-button label="直调发货" /> -->
-         <el-radio-button label="历史记录" />
+      <el-radio-button label="历史记录"/>
     </el-radio-group>
     <br><br>
 
@@ -76,17 +76,17 @@
               <div class="label">工程差价总额</div>
               <div class="value">{{ details.depositDiffAmount }}</div>
             </el-col>
-                   <el-col :xs="24" :sm="24" :lg="24" class="item" v-if="!isCustomer">
+            <el-col :xs="24" :sm="24" :lg="24" class="item" v-if="!isCustomer">
               <div class="label">格力内部备注</div>
               <div class="value">
-                 <el-input  v-model=" details.geLiInerNote" placeholder="格力内部备注" ></el-input>
+                <el-input v-model=" details.geLiInerNote" placeholder="格力内部备注"></el-input>
               </div>
             </el-col>
-             <el-col :xs="24" :sm="24" :lg="12" class="item">
+            <el-col :xs="24" :sm="24" :lg="12" class="item">
               <div class="label">使用单位</div>
               <div class="value">{{ details.refUseUnit }}</div>
             </el-col>
-<el-col :xs="24" :sm="24" :lg="12" class="item">
+            <el-col :xs="24" :sm="24" :lg="12" class="item">
               <div class="label">跨区厂编号</div>
               <div class="value">{{ details.refFactoryNo }}</div>
             </el-col>
@@ -107,7 +107,7 @@
             <el-col :xs="24" :sm="24" :lg="24" class="item">
               <div class="label">安装地址</div>
               <div class="value">
-                {{details.refInstallAddress}}
+                {{ details.refInstallAddress }}
               </div>
             </el-col>
 
@@ -130,7 +130,7 @@
         </el-form>
       </div>
       <h3>货品信息</h3>
-      <el-divider />
+      <el-divider/>
       <!-- 列表 -->
       <div class="mymain-container">
         <div class="table">
@@ -155,8 +155,8 @@
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.factoryNo" />
-                <span>{{scope.row.factoryNo}}</span>
+                <CopyButton :copyText="scope.row.factoryNo"/>
+                <span>{{ scope.row.factoryNo }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -168,8 +168,8 @@
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.specialNo" />
-                <span>{{scope.row.specialNo}}</span>
+                <CopyButton :copyText="scope.row.specialNo"/>
+                <span>{{ scope.row.specialNo }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -180,8 +180,8 @@
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.materialNumber" />
-                <span>{{scope.row.materialNumber}}</span>
+                <CopyButton :copyText="scope.row.materialNumber"/>
+                <span>{{ scope.row.materialNumber }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -192,8 +192,8 @@
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.materialOldNumber" />
-                <span>{{scope.row.materialOldNumber}}</span>
+                <CopyButton :copyText="scope.row.materialOldNumber"/>
+                <span>{{ scope.row.materialOldNumber }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -204,8 +204,8 @@
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.materialName" />
-                <span>{{scope.row.materialName}}</span>
+                <CopyButton :copyText="scope.row.materialName"/>
+                <span>{{ scope.row.materialName }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -216,8 +216,8 @@
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.specification" />
-                <span>{{scope.row.specification}}</span>
+                <CopyButton :copyText="scope.row.specification"/>
+                <span>{{ scope.row.specification }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -227,9 +227,9 @@
               min-width="160"
               show-overflow-tooltip
             >
-             <template slot-scope="scope">
-                {{ scope.row.price | numToFixed}}
-            </template>
+              <template slot-scope="scope">
+                {{ scope.row.price | numToFixed }}
+              </template>
             </el-table-column>
             <el-table-column
               align="right"
@@ -246,8 +246,8 @@
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                {{ scope.row.totalAmount | numToFixed}}
-            </template>
+                {{ scope.row.totalAmount | numToFixed }}
+              </template>
             </el-table-column>
             <el-table-column
               align="right"
@@ -263,9 +263,9 @@
               min-width="160"
               show-overflow-tooltip
             >
-             <template slot-scope="scope">
-                {{ scope.row.depositAmount | numToFixed}}
-            </template>
+              <template slot-scope="scope">
+                {{ scope.row.depositAmount | numToFixed }}
+              </template>
             </el-table-column>
             <el-table-column
               align="right"
@@ -281,9 +281,9 @@
               min-width="160"
               show-overflow-tooltip
             >
-             <template slot-scope="scope">
-                {{ scope.row.diffAmount | numToFixed}}
-            </template>
+              <template slot-scope="scope">
+                {{ scope.row.diffAmount | numToFixed }}
+              </template>
             </el-table-column>
           </el-table>
         </div>
@@ -295,12 +295,13 @@
         type="primary"
         size="small"
         @click="batchDownloadFn"
-      >批量下载</el-button>
+      >批量下载
+      </el-button>
 
-      <el-divider />
+      <el-divider/>
 
       <!-- 列表 -->
-      <div class="mymain-container" >
+      <div class="mymain-container">
         <div class="table">
           <el-table
             v-loading="listLoading"
@@ -394,7 +395,8 @@
                   type="text"
                   class="textColor"
                   @click="downLoadFn(scope.row.fileUrl,scope.row.fileName)"
-                >下载</el-button>
+                >下载
+                </el-button>
                 <!--                <el-button-->
                 <!--                  v-if="checkFileType(scope.row.fileUrl) == 'pdf'"-->
                 <!--                  type="text"-->
@@ -425,7 +427,7 @@
         </el-row>
       </div>
       <div style="margin-top: 25px">审批</div>
-      <el-divider />
+      <el-divider/>
       <div class="diy-table-1">
         <el-row :gutter="0">
           <el-col :xs="12" :sm="12" :lg="12" class="item">
@@ -477,17 +479,19 @@
           type="primary"
           size="small"
           @click="handleSvse"
-        >保存</el-button>
+        >保存
+        </el-button>
         <el-button
           type="primary"
           size="small"
           @click="handleReset"
-        >重置</el-button>
+        >重置
+        </el-button>
       </div>
     </div>
     <div v-show="engineering == '工程订单信息'">
       <h3>工程订单信息</h3>
-      <el-divider />
+      <el-divider/>
       <!-- 列表 -->
       <div class="mymain-container">
         <div class="table">
@@ -508,8 +512,8 @@
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.enginOrderNo" />
-                <span>{{scope.row.enginOrderNo}}</span>
+                <CopyButton :copyText="scope.row.enginOrderNo"/>
+                <span>{{ scope.row.enginOrderNo }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -527,8 +531,8 @@
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.materialName" />
-                <span>{{scope.row.materialName}}</span>
+                <CopyButton :copyText="scope.row.materialName"/>
+                <span>{{ scope.row.materialName }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -539,8 +543,8 @@
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.specification" />
-                <span>{{scope.row.specification}}</span>
+                <CopyButton :copyText="scope.row.specification"/>
+                <span>{{ scope.row.specification }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -550,9 +554,9 @@
               min-width="160"
               show-overflow-tooltip
             >
-            <template slot-scope="scope">
-                {{ scope.row.price | numToFixed}}
-            </template>
+              <template slot-scope="scope">
+                {{ scope.row.price | numToFixed }}
+              </template>
             </el-table-column>
             <el-table-column
               align="right"
@@ -568,9 +572,9 @@
               min-width="160"
               show-overflow-tooltip
             >
-            <template slot-scope="scope">
-                {{ scope.row.totalDepositAmount | numToFixed}}
-            </template>
+              <template slot-scope="scope">
+                {{ scope.row.totalDepositAmount | numToFixed }}
+              </template>
             </el-table-column>
           </el-table>
         </div>
@@ -578,7 +582,7 @@
     </div>
     <div v-show="engineering == '工程发货信息'">
       <h3>工程发货信息</h3>
-      <el-divider />
+      <el-divider/>
       <!-- 列表 -->
       <div class="mymain-container">
         <div class="table">
@@ -599,8 +603,8 @@
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.id" />
-                <span>{{scope.row.id}}</span>
+                <CopyButton :copyText="scope.row.id"/>
+                <span>{{ scope.row.id }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -618,8 +622,8 @@
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.materialName" />
-                <span>{{scope.row.materialName}}</span>
+                <CopyButton :copyText="scope.row.materialName"/>
+                <span>{{ scope.row.materialName }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -630,8 +634,8 @@
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.specification" />
-                <span>{{scope.row.specification}}</span>
+                <CopyButton :copyText="scope.row.specification"/>
+                <span>{{ scope.row.specification }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -641,9 +645,9 @@
               min-width="160"
               show-overflow-tooltip
             >
-             <template slot-scope="scope">
-                {{ scope.row.price | numToFixed}}
-            </template>
+              <template slot-scope="scope">
+                {{ scope.row.price | numToFixed }}
+              </template>
 
             </el-table-column>
             <el-table-column
@@ -689,8 +693,8 @@
             show-overflow-tooltip
           >
             <template slot-scope="scope">
-              <CopyButton :copyText="scope.row.id" />
-              <span>{{scope.row.id}}</span>
+              <CopyButton :copyText="scope.row.id"/>
+              <span>{{ scope.row.id }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -708,8 +712,8 @@
             show-overflow-tooltip
           >
             <template slot-scope="scope">
-              <CopyButton :copyText="scope.row.materialName" />
-              <span>{{scope.row.materialName}}</span>
+              <CopyButton :copyText="scope.row.materialName"/>
+              <span>{{ scope.row.materialName }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -720,8 +724,8 @@
             show-overflow-tooltip
           >
             <template slot-scope="scope">
-              <CopyButton :copyText="scope.row.specification" />
-              <span>{{scope.row.specification}}</span>
+              <CopyButton :copyText="scope.row.specification"/>
+              <span>{{ scope.row.specification }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -731,8 +735,8 @@
             min-width="160"
             show-overflow-tooltip
           >
-              <template slot-scope="scope">
-                {{ scope.row.price | numToFixed}}
+            <template slot-scope="scope">
+              {{ scope.row.price | numToFixed }}
             </template>
           </el-table-column>
           <el-table-column
@@ -759,9 +763,9 @@
         </el-table>
       </div>
     </div>
-       <div v-show="engineering == '历史记录'">
+    <div v-show="engineering == '历史记录'">
       <h3>历史记录</h3>
-      <el-divider />
+      <el-divider/>
       <!-- 列表 -->
       <div class="mymain-container">
         <div class="table">
@@ -782,15 +786,15 @@
               show-overflow-tooltip
             >
             </el-table-column>
-             <el-table-column
+            <el-table-column
               align="left"
               label="验收人"
-              prop="checkBy"
+              prop="checkName"
               min-width="160"
               show-overflow-tooltip
             >
             </el-table-column>
-              <el-table-column
+            <el-table-column
               align="left"
               label="申请退押金备注
 "
@@ -799,7 +803,7 @@
               show-overflow-tooltip
             >
             </el-table-column>
-                <el-table-column
+            <el-table-column
               align="left"
               label="验收说明
 "
@@ -809,7 +813,7 @@
             >
 
             </el-table-column>
-               <el-table-column
+            <el-table-column
               align="left"
               label="是否退押
 "
@@ -817,29 +821,26 @@
               min-width="160"
               show-overflow-tooltip
             >
-                <template slot-scope="scope">
-              {{scope.row.checkNote?'是':'否'}}
+              <template slot-scope="scope">
+                {{ scope.row.isRefundDeposit ? '是' : '否' }}
               </template>
             </el-table-column>
-                <el-table-column
+            <el-table-column
               align="left"
               label="提交人
 "
-              prop="submitBy"
+              prop="submitName"
               min-width="160"
               show-overflow-tooltip
             >
-
             </el-table-column>
-                <el-table-column
+            <el-table-column
               align="left"
-              label="提交时间
-"
+              label="提交时间"
               prop="submitTime"
               min-width="160"
               show-overflow-tooltip
             >
-
             </el-table-column>
           </el-table>
         </div>
@@ -849,10 +850,10 @@
 </template>
 
 <script>
-import { editInfo, geDetail, geOrderInfo, getListProject } from '@/api/engin_deposit.js'
-import { getList } from '@/api/supply/adjust'
-import { downloadFiles, downloadPdf } from '@/utils/util'
-import { getFileUrl } from '@/api/common'
+import {editInfo, geDetail, geOrderInfo, getListProject} from '@/api/engin_deposit.js'
+import {getList} from '@/api/supply/adjust'
+import {downloadFiles, downloadPdf} from '@/utils/util'
+import {getFileUrl} from '@/api/common'
 
 export default {
   data() {
@@ -874,13 +875,13 @@ export default {
       },
       deliverFormRules: {
         date: [
-          { required: true, message: '请选择发货日期', trigger: 'change' }
+          {required: true, message: '请选择发货日期', trigger: 'change'}
         ],
         warehouse: [
-          { required: true, message: '请选择发货仓库', trigger: 'change' }
+          {required: true, message: '请选择发货仓库', trigger: 'change'}
         ],
         position: [
-          { required: true, message: '请选择仓位', trigger: 'change' }
+          {required: true, message: '请选择仓位', trigger: 'change'}
         ]
       },
       orderType: {
@@ -894,8 +895,8 @@ export default {
   created() {
     this.getDetail()
   },
-  computed:{
-    isCustomer(){
+  computed: {
+    isCustomer() {
       return this.$store.getters.customerId && this.$store.getters.customerNumber
     }
   },
@@ -903,7 +904,7 @@ export default {
     getDetail() {
 
       if (this.engineering == '工程押金信息') {
-        geDetail({ id: this.$parent.depositManageId }).then((res) => {
+        geDetail({id: this.$parent.depositManageId}).then((res) => {
           this.details = res.data
           if (res.data.dataList.length == 0) {
             this.isDis = true
@@ -927,7 +928,7 @@ export default {
         getListProject({
           pageSize: -1,
           pageNum: 1,
-          type:3,
+          type: 3,
           refEnginRecordNo: this.$parent.refEnginRecordNo,
 
         }).then((res) => {
@@ -941,7 +942,7 @@ export default {
           refEnginRecordNo: this.$parent.refEnginRecordNo,
 
         }).then((res) => {
-          this.projectList= res.data.records
+          this.projectList = res.data.records
         })
 
 
@@ -949,7 +950,7 @@ export default {
     },
     // 批量下载
     async batchDownloadFn() {
-      downloadFiles('/deposit-manage/downZip', { parentId: this.$parent.depositManageId })
+      downloadFiles('/deposit-manage/downZip', {parentId: this.$parent.depositManageId})
     },
     // 下载
     downLoadFn(v, fileName) {
@@ -957,7 +958,7 @@ export default {
         downloadPdf(this.$imageUrl + v, fileName)
         return
       }
-          downloadFiles("/common/file/getStream", { key: v, fileName:fileName});
+      downloadFiles("/common/file/getStream", {key: v, fileName: fileName});
       // getFileUrl({ key: v }).then((res) => {
       //   window.open(res.data)
       // })
@@ -1014,29 +1015,35 @@ export default {
   height: 64px;
   width: 64px;
 }
+
 .gdzl {
   display: inline-block;
 }
+
 .batchDownload {
   float: right;
   margin-top: 9px;
 }
+
 ::v-deep .el-input__prefix {
   display: none;
   left: 65px !important;
   -webkit-transition: all 0.3s;
   transition: all 0.3s;
 }
+
 ::v-deep .el-date-editor.el-input {
   width: 100%;
   box-sizing: border-box;
   padding-left: 10px;
 }
+
 .diy-table-1 {
   ::v-deep .el-form-item {
     margin: 0;
   }
 }
+
 .zd {
   ::v-deep .el-input__suffix {
     right: 0;
@@ -1044,6 +1051,7 @@ export default {
     transition: all 0.3s;
   }
 }
+
 ::v-deep .el-input__suffix {
   right: -15px;
   -webkit-transition: all 0.3s;

src/views/deposit_home/components/refund_list-detail.vue

@@ -306,11 +306,11 @@
       <el-row :gutter="0">
         <el-col :xs="12" :sm="12" :lg="12" class="item">
           <div class="label">申请人</div>
-          <div class="value">{{ detailList.createBy }}</div>
+          <div class="value">{{ detailList.submitName }}</div>
         </el-col>
         <el-col :xs="12" :sm="12" :lg="12" class="item">
           <div class="label">申请日期</div>
-          <div class="value">{{ detailList.createTime }}</div>
+          <div class="value">{{ detailList.submitTime }}</div>
         </el-col>
         <el-col :xs="12" :sm="24" :lg="24" class="item">
           <div class="label">申请退押金</div>
@@ -325,12 +325,11 @@
     <div class="mymain-container">
       <div class="table">
         <el-table v-loading="listLoading" :data="detailList.checkRecordItems" element-loading-text="Loading" border fit highlight-current-row stripe>
-          <el-table-column align="left" label="申请人" prop="submitBy" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="申请人" prop="submitName" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="left" label="申请日期" prop="submitTime" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="left" label="申请说明" prop="applyNote" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="验收人" prop="checkBy" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="验收人" prop="checkName" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="left" label="受理日期" prop="checkDate" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="是否退押" prop="checkBy" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="left" label="验收说明" prop="checkNote" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="left" label="审批结果" prop="isRefundDeposit" min-width="160" show-overflow-tooltip>
             <template slot-scope="scope">

src/views/deposit_home/refund_list.vue

@@ -322,10 +322,10 @@
 
             <el-table-column align="right" label="安装日期" prop="installDate" min-width="160" show-overflow-tooltip>
             </el-table-column>
-            <el-table-column align="left" label="审核人" prop="confirmBy" min-width="160" show-overflow-tooltip>
+            <el-table-column align="left" label="审核人" prop="confirmName" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.confirmBy" />
-                <span>{{scope.row.confirmBy}}</span>
+                <CopyButton :copyText="scope.row.confirmName" />
+                <span>{{scope.row.confirmName}}</span>
               </template>
             </el-table-column>
 

src/views/supply/engin/components/commerce_detail.vue

@@ -110,7 +110,7 @@
             </el-col>
             <el-col :span="6" class="item">
               <div class="label">制单人</div>
-              <div class="value">{{detailData.createBy}}</div>
+              <div class="value">{{detailData.createName}}</div>
             </el-col>
             <el-col :span="6" class="item">
               <div class="label">制单日期</div>
@@ -118,7 +118,7 @@
             </el-col>
             <el-col :span="6" class="item">
               <div class="label">审核人</div>
-              <div class="value">{{detailData.confirmBy}}</div>
+              <div class="value">{{detailData.confirmName}}</div>
             </el-col>
             <el-col :span="6" class="item">
               <div class="label">审核日期</div>
@@ -126,7 +126,7 @@
             </el-col>
             <el-col :span="6" class="item">
               <div class="label">最后更新人</div>
-              <div class="value">{{detailData.updateBy}}</div>
+              <div class="value">{{detailData.updateName}}</div>
             </el-col>
             <el-col :span="6" class="item">
               <div class="label">最后更新日期</div>
@@ -134,7 +134,7 @@
             </el-col>
             <el-col :span="6" class="item">
               <div class="label">关闭人</div>
-              <div class="value">{{detailData.closeBy}}</div>
+              <div class="value">{{detailData.closeName}}</div>
             </el-col>
             <el-col :span="6" class="item">
               <div class="label">关闭日期</div>

src/views/supply/engin/components/commerce_examine.vue

@@ -115,7 +115,7 @@
         </el-col>
         <el-col :span="6" class="item">
           <div class="label">制单人</div>
-          <div class="value">{{detailData.createBy}}</div>
+          <div class="value">{{detailData.createName}}</div>
         </el-col>
         <el-col :span="6" class="item">
           <div class="label">制单日期</div>
@@ -123,7 +123,7 @@
         </el-col>
         <el-col :span="6" class="item">
           <div class="label">关闭人</div>
-          <div class="value">{{detailData.closeBy}}</div>
+          <div class="value">{{detailData.closeName}}</div>
         </el-col>
         <el-col :span="6" class="item">
           <div class="label">关闭日期</div>

src/views/supply/engin/components/commerce_form.vue

@@ -620,7 +620,7 @@ export default {
         this.mainForm.geLiInerNote = data.geLiInerNote;
         this.mainForm.geLiNote = data.geLiNote;
         this.mainForm.remark = data.remark;
-        this.mainForm.createMan = data.createBy;
+        this.mainForm.createMan = data.createName;
         this.mainForm.createDate = data.createTime;
         this.mainForm.fileNo = data.fileNo;
         this.mainForm.salesMan = data.serviceId;

src/views/supply/engin/components/commerce_return.vue

@@ -98,7 +98,7 @@
         </el-col>
         <el-col :span="6" class="item">
           <div class="label">制单人</div>
-          <div class="value">{{detailData.createBy}}</div>
+          <div class="value">{{detailData.createName}}</div>
         </el-col>
         <el-col :span="6" class="item">
           <div class="label">制单日期</div>
@@ -106,7 +106,7 @@
         </el-col>
         <el-col :span="6" class="item">
           <div class="label">关闭人</div>
-          <div class="value">{{detailData.closeBy}}</div>
+          <div class="value">{{detailData.closeName}}</div>
         </el-col>
         <el-col :span="6" class="item">
           <div class="label">关闭日期</div>

src/views/supply/engin/components/engin_detail.vue

@@ -98,7 +98,7 @@
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">制单人</div>
-          <div class="value">{{detailData.createBy}}</div>
+          <div class="value">{{detailData.createName}}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">制单日期</div>
@@ -159,7 +159,7 @@
         <el-row :gutter="0">
           <el-col :span="12" class="item">
             <div class="label">审批人</div>
-            <div class="value">{{detailData.confirmBy}}</div>
+            <div class="value">{{detailData.confirmName}}</div>
           </el-col>
           <el-col :span="12" class="item">
             <div class="label">审批结果</div>

src/views/supply/engin/components/engin_examine.vue

@@ -138,7 +138,7 @@
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">制单人</div>
-          <div class="value">{{detailData.createBy}}</div>
+          <div class="value">{{detailData.createName}}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">制单日期</div>
@@ -168,7 +168,7 @@
     </div>
 
     <div class="table" style="margin-top: 20px">
-      <el-table :data="goodsList" element-loading-text="Loading" border fit highlight-current-row stripe max-height="400" 
+      <el-table :data="goodsList" element-loading-text="Loading" border fit highlight-current-row stripe max-height="400"
       show-summary
             :summary-method="$getSummaries">
         <el-table-column align="center" label="序号" type="index" width="50"></el-table-column>

src/views/supply/engin/components/engin_form.vue

@@ -515,7 +515,7 @@ export default {
         this.mainForm.tel = data.tel;
         this.mainForm.remark = data.remark;
         this.mainForm.salesMan = data.serviceId;
-        this.mainForm.createMan = data.createBy;
+        this.mainForm.createMan = data.createName;
         this.mainForm.createDate = data.createTime;
         this.mainForm.contractDate = data.contractExpireDate;
         this.mainForm.power = data.powerCategory;

src/views/supply/engin/components/home_examine.vue

@@ -177,7 +177,7 @@
         </el-col>
         <el-col :span="6" class="item">
           <div class="label">制单人</div>
-          <div class="value">{{detailData.createBy}}</div>
+          <div class="value">{{detailData.createName}}</div>
         </el-col>
         <el-col :span="6" class="item">
           <div class="label">制单日期</div>
@@ -185,7 +185,7 @@
         </el-col>
         <el-col :span="6" class="item">
           <div class="label">关闭人</div>
-          <div class="value">{{detailData.closeBy}}</div>
+          <div class="value">{{detailData.closeName}}</div>
         </el-col>
         <el-col :span="6" class="item">
           <div class="label">关闭日期</div>

src/views/supply/engin/components/home_form.vue

@@ -902,7 +902,7 @@ export default {
         this.mainForm.greeRemark = data.geLiInerNote;
         this.mainForm.greeReply = data.note1;
         this.mainForm.remark = data.remark;
-        this.mainForm.createMan = data.createBy;
+        this.mainForm.createMan = data.createName;
         this.mainForm.createDate = data.createTime;
         this.mainForm.fileNum = data.fileNo;
         this.mainForm.salesMan = data.serviceId;
@@ -1141,7 +1141,7 @@ export default {
               return;
             }
             }
-           
+
           }
 
           let goodsList = JSON.parse(JSON.stringify(this.goodsList));

src/views/supply/engin/components/home_return.vue

@@ -123,7 +123,7 @@
         </el-col>
         <el-col :span="6" class="item">
           <div class="label">制单人</div>
-          <div class="value">{{detailData.createBy}}</div>
+          <div class="value">{{detailData.createName}}</div>
         </el-col>
         <el-col :span="6" class="item">
           <div class="label">制单日期</div>
@@ -131,7 +131,7 @@
         </el-col>
         <el-col :span="6" class="item">
           <div class="label">关闭人</div>
-          <div class="value">{{detailData.closeBy}}</div>
+          <div class="value">{{detailData.closeName}}</div>
         </el-col>
         <el-col :span="6" class="item">
           <div class="label">关闭日期</div>

src/views/supply/engin/engin_list.vue

@@ -193,9 +193,9 @@
              <el-table-column align="left" label="表体业务员" sortable prop="itemServiceName" min-width="110" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="表头业务员" sortable prop="serviceName" min-width="110" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="备注" sortable prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="制表人" sortable prop="createBy" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="制表人" sortable prop="createName" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="制表日期" sortable prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="审核人" sortable prop="confirmBy" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="审核人" sortable prop="confirmName" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="审核日期" sortable prop="confirmTime" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="操作" width="210" fixed="right">
               <template slot-scope="scope">