Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/FinancialModule/BasicDocuments.vue

@@ -1368,7 +1368,7 @@
             <div style="display: flex;align-items: center;margin-top:15px;"  v-if="is_financeShow && GetDetail.Type==2 && item.AuditDescription.indexOf('会计')!=-1">
                 <div style="display: flex;align-items: center;flex-grow: 1;">
                   <span style="font-size: 14px;">{{$t('objFill.xiugaidianfudx')}}：</span>
-                  <div style="display: flex;flex-grow: 1;">
+                  <div style="display: flex;">
                     <el-select
     v-model="AuditOrRefundMsg.KingdeeClientID"  class="w135 _border_b_1"
     filterable
@@ -1390,7 +1390,12 @@
                                 </el-option>
   </el-select>
                   </div>
-                  <div style="display: flex;flex-grow: 1;" v-if="GetDetail.AuditNumber!=''">
+
+                  <span style="font-size: 14px;margin-left:20px;">{{$t('objFill.duizhangqueren')}}：</span>
+                  <div style="display: flex;">
+                    <el-date-picker class="w135 _border_b_1" v-model="AuditOrRefundMsg.CheckPeriod" type="month" value-format="yyyy-MM" :placeholder="$t('objFill.qingxzzq')"></el-date-picker>
+                  </div>
+                  <div style="display: flex;margin-left:10px;" v-if="GetDetail.AuditNumber!=''">
                   <span style="font-size: 24px;">{{GetDetail.AuditNumber}}</span>
                   </div>
                 </div>
@@ -1745,7 +1750,7 @@ class="w135 _border_b_1">
               <div style="display: flex;align-items: center;margin-top:15px;"  v-if="is_financeShow && GetDetail.Type==2 && item.AuditDescription.indexOf('会计')!=-1">
                 <div style="display: flex;align-items: center;flex-grow: 1;">
                   <span style="font-size: 14px;">{{$t('objFill.xiugaidianfudx')}}：</span>
-                  <div style="display: flex;flex-grow: 1;">
+                  <div style="display: flex;">
                     <el-select
     v-model="AuditOrRefundMsg.KingdeeClientID"  class="w135 _border_b_1"
     filterable
@@ -1767,7 +1772,11 @@ class="w135 _border_b_1">
                                 </el-option>
   </el-select>
                   </div>
-                  <div style="display: flex;flex-grow: 1;" v-if="GetDetail.AuditNumber!=''">
+                  <span style="font-size: 14px;margin-left:20px;">{{$t('objFill.duizhangqueren')}}：</span>
+                  <div style="display: flex;">
+                    <el-date-picker class="w135 _border_b_1" v-model="AuditOrRefundMsg.CheckPeriod" type="month" value-format="yyyy-MM" :placeholder="$t('objFill.qingxzzq')"></el-date-picker>
+                  </div>
+                  <div style="display: flex;margin-left:10px;" v-if="GetDetail.AuditNumber!=''">
                   <span style="font-size: 24px;">{{GetDetail.AuditNumber}}</span>
                   </div>
                 </div>
@@ -2340,7 +2349,8 @@ class="w135 _border_b_1">
           FinanceMoney:0,
           FCostTypeId:'1851',
           BankAccountId:'40',
-          AccountNumber:''
+          AccountNumber:'',
+          CheckPeriod:''
         },
         AuditListData: {
           AuditList: []

src/components/FinancialModule/FinancialDocuments.vue

@@ -1336,7 +1336,7 @@
                 </el-tooltip>
                 <el-tooltip v-if="ActionMenuCode.indexOf('F_Update_TradeDate')!=-1" class="item"
                   :content="$t('fnc.tzjyriqi')+'111'" placement="top">
-                  <i v-if="msg.Conditon==2 && scope.row.TradeDate" class="iconfont icon-tiaozheng"
+                  <i v-if="(msg.Conditon==1 || msg.Conditon==2) && scope.row.TradeDate" class="iconfont icon-tiaozheng"
                     @click="dialogFormVisible=true,updateMsg.FrID=scope.row.FrID,updateMsg.OTradeDate=scope.row.TradeDate"></i>
                 </el-tooltip>