Merge branch 'dev1.0.1' of http://192.168.0.200:3000/suf/factoring-trade-front-end-v2 into chang1

src/components/Dialog/index.vue

@@ -44,7 +44,7 @@ export default {
       type: Boolean
     },
     append: {
-      default: false,
+      default: true,
       type: Boolean
     },
     isShow: {

src/views/acceptanceManagement/components/historyViewContent/add.vue

@@ -25,7 +25,7 @@
         <el-input :value="ruleForm.businessNumber" disabled />
       </el-form-item>
       <el-form-item label="预估结算日期" prop="expectedSettlementDate">
-        <el-date-picker v-model="ruleForm.expectedSettlementDate" value-format="yyyy-MM-dd" type="date" placeholder="选择预估结算日期"  style="width: 100%;" disabled />
+        <el-date-picker v-model="ruleForm.expectedSettlementDate" value-format="yyyy-MM-dd" type="date" placeholder="选择预估结算日期" style="width: 100%;" disabled />
       </el-form-item>
 
       <!-- 签署确认 -->
@@ -289,7 +289,8 @@ export default {
             supplier,
             acceptancePersonInfoHistories,
             supplementFiles,
-            fileStorage
+            fileStorage,
+            approval
           } = JSON.parse(JSON.stringify(newV))
 
           this.ruleForm = {
@@ -304,7 +305,8 @@ export default {
             checkOperatorEnterpriseContact,
             steelWaiter,
             sellBillNumber,
-            additionalRemarks
+            additionalRemarks,
+            approval
           }
           const { projectName } = businessBasicInfo
           const { corporateName } = customer
@@ -316,7 +318,7 @@ export default {
           this.ruleForm.coreEnterpriseName = corporateName
           this.ruleForm.platformName = platformName
           this.ruleForm.projectName = projectName
-          this.ruleForm.approval = 1
+          // this.ruleForm.approval = approval
 
           this.goodsInfoList = acceptanceBusinessGoods
           acceptancePersonInfoHistories.map(item => {

src/views/userManagement/indexTable.js

@@ -28,7 +28,7 @@ export default {
         label: '用户名称',
         showTooltip: true,
         width: '100',
-        prop: 'userName'
+        prop: 'loginName'
       },
       {
         label: '登录手机号码',