md

src/views/emis/emisSettlePayRecord/panel/PayRecordList.vue

@@ -21,6 +21,17 @@
       <el-table-column type="expand">
        <template slot-scope="scope">
           <div style="padding: 8px 50px;background: white;">
+            <div>
+              <el-button
+                  type="warning"
+                  plain
+                  icon="el-icon-download"
+                  size="mini"
+                  @click="handleReturn"
+                  v-hasPermi="['emis:payRecordReturn']"
+                >收款回退</el-button>
+            </div>
+
             <div>收款单号:</div>
             <PayRecordSubBillRelList :payId="scope.row.payId"> </PayRecordSubBillRelList>
           </div>
@@ -104,6 +115,7 @@
       <el-table-column label="登记网点" align="center" prop="createSiteName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="登记时间" align="center" prop="createTime"  width="170"/>
 
+
     </el-table>
 
   </div>

src/views/emis/emisTmsScanRecord/signatureRecordQuery.vue

@@ -104,7 +104,7 @@
       </el-table-column>
       <el-table-column :label="$t('派件员')" align="center" prop="dispatchOrSendMan" min-width="170">
         <template slot-scope="scope">
-          <span>{{ scope.row.waybillDetail.dispatchManName }}</span>
+          <span>{{ scope.row.dispatchOrSendMan }}</span>
         </template>
       </el-table-column>
 
@@ -165,9 +165,9 @@
             <span class="ellipsis">{{ scope.row.waybillDetail.customerName }}</span>
           </template>
       </el-table-column>
-      <el-table-column :label="$t('数据产生来源')" align="center" prop="waybillDetail.dataFrom" min-width="150">
+      <el-table-column :label="$t('数据产生来源')" align="center" prop="dataFrom" min-width="150">
         <template slot-scope="scope">
-          <span>{{ scope.row.waybillDetail.dataFrom }}</span>
+          <span>{{ scope.row.dataFrom }}</span>
         </template>
       </el-table-column>
       <el-table-column :label="$t('签收信息备注')" align="center" prop="remark" min-width="150">

src/views/emis/emisUser/editForm.vue

@@ -520,7 +520,7 @@ export default {
       });
     },
     onSiteCodeChange(){
-      if(this.form.userId==null){
+      if(this.form.userId==null&&this.form.ownerSiteCode!=null){
         console.log(this.form.ownerSiteCode)
         getNewEmpCode(this.form.ownerSiteCode).then(response => {
           this.form.empCode=response.data;