From ad36687d753c89d4cb122b35d3bfdeca9e367c53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Tue, 10 Oct 2023 13:28:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/mdp-ui/mdp-table/Index.vue     |  2 +-
 src/components/mdp-ui/mixin/MdpSelectMixin.js |  3 +--
 src/views/mdp/menu/menuModuleBranch/Index.vue | 10 +++++-----
 src/views/mdp/mo/moOrder/Index.vue            | 18 +++++++++---------
 src/views/mdp/sys/deptPostUser/Index.vue      |  8 ++++----
 src/views/mdp/sys/userValidInfo/Index.vue     |  4 ++--
 6 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/src/components/mdp-ui/mdp-table/Index.vue b/src/components/mdp-ui/mdp-table/Index.vue
index 26e3dfa..75e6f0d 100644
--- a/src/components/mdp-ui/mdp-table/Index.vue
+++ b/src/components/mdp-ui/mdp-table/Index.vue
@@ -44,7 +44,7 @@
               <el-table-column :key="col.property+'_'+idx" :prop="col.property"  :label="col.label" min-width="120" show-overflow-tooltip :col-type="col.colType" v-if="showCol(col.property)">
                 <template  slot-scope="scope">
                     <mdp-input show-style="tag" v-if="col.colType=='String'" v-model="scope.row[col.property]" :disabled="!edit||disabledJudge(col.colType)"/>
-                    <mdpp-date show-style="tag" v-else-if="col.colType=='Date'" type="date" placeholder="选择日期" v-model="scope.row[col.property]"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" :disabled="!edit||disabledJudge(col.colType)"/>
+                    <mdp-date show-style="tag" v-else-if="col.colType=='Date'" type="date" placeholder="选择日期" v-model="scope.row[col.property]"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" :disabled="!edit||disabledJudge(col.colType)"/>
                     <mdp-select show-style="tag"  v-else-if="col.colType=='boolean' || col.colType=='Boolean'" type="radio" v-model="scope.row[col.property]" :disabled="!edit||disabledJudge(col.colType)" :options="[{id:'0',name:'否'},{id:'1',name:'是'}]" />
                     <mdp-number show-style="tag" v-else-if="col.colType=='Number'" v-model="scope.row[col.property]" :disabled="!edit||disabledJudge(col.colType)"/>
                     <mdp-number show-style="tag" v-else-if="col.colType=='Integer' || col.colType=='int'" v-model="scope.row[col.property]" :precision="0" :disabled="!edit||disabledJudge(col.colType)"/>
diff --git a/src/components/mdp-ui/mixin/MdpSelectMixin.js b/src/components/mdp-ui/mixin/MdpSelectMixin.js
index abbb56b..16102ea 100644
--- a/src/components/mdp-ui/mixin/MdpSelectMixin.js
+++ b/src/components/mdp-ui/mixin/MdpSelectMixin.js
@@ -563,8 +563,7 @@ export const MdpSelectMixin = {
                 return option
             })
          },
-         initMyValByValue(val,isFirst){ 
-          debugger
+         initMyValByValue(val,isFirst){  
             if( this.myVal==val){
                 return;
             } 
diff --git a/src/views/mdp/menu/menuModuleBranch/Index.vue b/src/views/mdp/menu/menuModuleBranch/Index.vue
index 3685a61..8e43165 100644
--- a/src/views/mdp/menu/menuModuleBranch/Index.vue
+++ b/src/views/mdp/menu/menuModuleBranch/Index.vue
@@ -34,12 +34,12 @@
 				</el-table-column>
 				<el-table-column prop="startTime"  label="启用日期" min-width="120" show-overflow-tooltip col-type="Date" v-if="showCol('startTime')">
 				    <template slot-scope="scope">
-                            <mdpp-date type="date" placeholder="选择日期" show-style="tag" v-model="scope.row.startTime"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" :disabled="disabledJudge('startTime')"/>
+                            <mdp-date type="date" placeholder="选择日期" show-style="tag" v-model="scope.row.startTime"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" :disabled="disabledJudge('startTime')"/>
 				    </template>
 				</el-table-column>
 				<el-table-column prop="endTime"  label="结束日期" min-width="120" show-overflow-tooltip col-type="Date" v-if="showCol('endTime')">
 				    <template slot-scope="scope">
-                            <mdpp-date type="date" placeholder="选择日期" show-style="tag" v-model="scope.row.endTime"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" :disabled="disabledJudge('endTime')"/>
+                            <mdp-date type="date" placeholder="选择日期" show-style="tag" v-model="scope.row.endTime"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" :disabled="disabledJudge('endTime')"/>
 				    </template>
 				</el-table-column>
 				<el-table-column prop="status"  label="状态" min-width="120" show-overflow-tooltip col-type="String" v-if="showCol('status')">
@@ -69,7 +69,7 @@
 				</el-table-column>
 				<el-table-column prop="feeDate"  label="开始计费日期" min-width="120" show-overflow-tooltip col-type="Date" v-if="showCol('feeDate')">
 				    <template slot-scope="scope">
-                            <mdpp-date type="date" placeholder="选择日期" show-style="tag" v-model="scope.row.feeDate"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" :disabled="disabledJudge('feeDate')"/>
+                            <mdp-date type="date" placeholder="选择日期" show-style="tag" v-model="scope.row.feeDate"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" :disabled="disabledJudge('feeDate')"/>
 				    </template>
 				</el-table-column>
 				<el-table-column prop="crowd"  label="是否为众包" min-width="120" show-overflow-tooltip col-type="String" v-if="showCol('crowd')">
@@ -99,12 +99,12 @@
 				</el-table-column>
 				<el-table-column prop="ctime"  label="创建日期" min-width="120" show-overflow-tooltip col-type="Date" v-if="showCol('ctime')">
 				    <template slot-scope="scope">
-                            <mdpp-date type="date" placeholder="选择日期" show-style="tag" v-model="scope.row.ctime"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" :disabled="disabledJudge('ctime')"/>
+                            <mdp-date type="date" placeholder="选择日期" show-style="tag" v-model="scope.row.ctime"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" :disabled="disabledJudge('ctime')"/>
 				    </template>
 				</el-table-column>
 				<el-table-column prop="ltime"  label="更新日期" min-width="120" show-overflow-tooltip col-type="Date" v-if="showCol('ltime')">
 				    <template slot-scope="scope">
-                            <mdpp-date type="date" placeholder="选择日期" show-style="tag" v-model="scope.row.ltime"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" :disabled="disabledJudge('ltime')"/>
+                            <mdp-date type="date" placeholder="选择日期" show-style="tag" v-model="scope.row.ltime"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" :disabled="disabledJudge('ltime')"/>
 				    </template>
 				</el-table-column>
 				<el-table-column prop="cuserid"  label="创建人编号" min-width="120" show-overflow-tooltip col-type="String" v-if="showCol('cuserid')">
diff --git a/src/views/mdp/mo/moOrder/Index.vue b/src/views/mdp/mo/moOrder/Index.vue
index ca3859e..1cc1ac3 100644
--- a/src/views/mdp/mo/moOrder/Index.vue
+++ b/src/views/mdp/mo/moOrder/Index.vue
@@ -58,17 +58,17 @@
 				</el-table-column>
 				<el-table-column prop="ctime"  label="创建时间" min-width="120" show-overflow-tooltip col-type="Date" v-if="showCol('ctime')">
 				    <template slot-scope="scope">
-                            <mdpp-date type="date" placeholder="选择日期" show-style="tag" v-model="scope.row.ctime"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" :disabled="disabledJudge('ctime')"/>
+                            <mdp-date type="date" placeholder="选择日期" show-style="tag" v-model="scope.row.ctime"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" :disabled="disabledJudge('ctime')"/>
 				    </template>
 				</el-table-column>
 				<el-table-column prop="payTime"  label="付款时间" min-width="120" show-overflow-tooltip col-type="Date" v-if="showCol('payTime')">
 				    <template slot-scope="scope">
-                            <mdpp-date type="date" placeholder="选择日期" show-style="tag" v-model="scope.row.payTime"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" :disabled="disabledJudge('payTime')"/>
+                            <mdp-date type="date" placeholder="选择日期" show-style="tag" v-model="scope.row.payTime"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" :disabled="disabledJudge('payTime')"/>
 				    </template>
 				</el-table-column>
 				<el-table-column prop="payCtime"  label="付款确认时间" min-width="120" show-overflow-tooltip col-type="Date" v-if="showCol('payCtime')">
 				    <template slot-scope="scope">
-                            <mdpp-date type="date" placeholder="选择日期" show-style="tag" v-model="scope.row.payCtime"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" :disabled="disabledJudge('payCtime')"/>
+                            <mdp-date type="date" placeholder="选择日期" show-style="tag" v-model="scope.row.payCtime"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" :disabled="disabledJudge('payCtime')"/>
 				    </template>
 				</el-table-column>
 				<el-table-column prop="moOrginFee"  label="折扣前总价=模块中orgin_fee合计" min-width="120" show-overflow-tooltip col-type="BigDecimal" v-if="showCol('moOrginFee')">
@@ -93,12 +93,12 @@
 				</el-table-column>
 				<el-table-column prop="startTime"  label="启用日期" min-width="120" show-overflow-tooltip col-type="Date" v-if="showCol('startTime')">
 				    <template slot-scope="scope">
-                            <mdpp-date type="date" placeholder="选择日期" show-style="tag" v-model="scope.row.startTime"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" :disabled="disabledJudge('startTime')"/>
+                            <mdp-date type="date" placeholder="选择日期" show-style="tag" v-model="scope.row.startTime"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" :disabled="disabledJudge('startTime')"/>
 				    </template>
 				</el-table-column>
 				<el-table-column prop="endTime"  label="结束日期" min-width="120" show-overflow-tooltip col-type="Date" v-if="showCol('endTime')">
 				    <template slot-scope="scope">
-                            <mdpp-date type="date" placeholder="选择日期" show-style="tag" v-model="scope.row.endTime"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" :disabled="disabledJudge('endTime')"/>
+                            <mdp-date type="date" placeholder="选择日期" show-style="tag" v-model="scope.row.endTime"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" :disabled="disabledJudge('endTime')"/>
 				    </template>
 				</el-table-column>
 				<el-table-column prop="payType"  label="支付方式" min-width="120" show-overflow-tooltip col-type="String" v-if="showCol('payType')">
@@ -148,12 +148,12 @@
 				</el-table-column>
 				<el-table-column prop="finishTime"  label="完成时间" min-width="120" show-overflow-tooltip col-type="Date" v-if="showCol('finishTime')">
 				    <template slot-scope="scope">
-                            <mdpp-date type="date" placeholder="选择日期" show-style="tag" v-model="scope.row.finishTime"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" :disabled="disabledJudge('finishTime')"/>
+                            <mdp-date type="date" placeholder="选择日期" show-style="tag" v-model="scope.row.finishTime"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" :disabled="disabledJudge('finishTime')"/>
 				    </template>
 				</el-table-column>
 				<el-table-column prop="closeTime"  label="关闭时间" min-width="120" show-overflow-tooltip col-type="Date" v-if="showCol('closeTime')">
 				    <template slot-scope="scope">
-                            <mdpp-date type="date" placeholder="选择日期" show-style="tag" v-model="scope.row.closeTime"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" :disabled="disabledJudge('closeTime')"/>
+                            <mdp-date type="date" placeholder="选择日期" show-style="tag" v-model="scope.row.closeTime"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" :disabled="disabledJudge('closeTime')"/>
 				    </template>
 				</el-table-column>
 				<el-table-column prop="sstatus"  label="结算状态" min-width="120" show-overflow-tooltip col-type="String" v-if="showCol('sstatus')">
@@ -163,7 +163,7 @@
 				</el-table-column>
 				<el-table-column prop="setTime"  label="结算时间" min-width="120" show-overflow-tooltip col-type="Date" v-if="showCol('setTime')">
 				    <template slot-scope="scope">
-                            <mdpp-date type="date" placeholder="选择日期" show-style="tag" v-model="scope.row.setTime"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" :disabled="disabledJudge('setTime')"/>
+                            <mdp-date type="date" placeholder="选择日期" show-style="tag" v-model="scope.row.setTime"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" :disabled="disabledJudge('setTime')"/>
 				    </template>
 				</el-table-column>
 				<el-table-column prop="odays"  label="购买天数" min-width="120" show-overflow-tooltip col-type="Integer" v-if="showCol('odays')">
@@ -248,7 +248,7 @@
 				</el-table-column>
 				<el-table-column prop="invoiceTime"  label="开票时间" min-width="120" show-overflow-tooltip col-type="Date" v-if="showCol('invoiceTime')">
 				    <template slot-scope="scope">
-                            <mdpp-date type="date" placeholder="选择日期" show-style="tag" v-model="scope.row.invoiceTime"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" :disabled="disabledJudge('invoiceTime')"/>
+                            <mdp-date type="date" placeholder="选择日期" show-style="tag" v-model="scope.row.invoiceTime"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" :disabled="disabledJudge('invoiceTime')"/>
 				    </template>
 				</el-table-column>
 				<el-table-column prop="invoiceId"  label="发票编号" min-width="120" show-overflow-tooltip col-type="String" v-if="showCol('invoiceId')">
diff --git a/src/views/mdp/sys/deptPostUser/Index.vue b/src/views/mdp/sys/deptPostUser/Index.vue
index 17e45da..ac0a768 100644
--- a/src/views/mdp/sys/deptPostUser/Index.vue
+++ b/src/views/mdp/sys/deptPostUser/Index.vue
@@ -47,17 +47,17 @@
 
 				<el-table-column prop="startDate"  label="开始任职时间" min-width="120" show-overflow-tooltip col-type="Date" v-if="showCol('startDate')">
 				    <template slot-scope="scope">
-                            <mdpp-date type="date" placeholder="选择日期" show-style="tag" v-model="scope.row.startDate"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" :disabled="disabledJudge('startDate')"/>
+                            <mdp-date type="date" placeholder="选择日期" show-style="tag" v-model="scope.row.startDate"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" :disabled="disabledJudge('startDate')"/>
 				    </template>
 				</el-table-column>
 				<el-table-column prop="endDate"  label="结束任职时间" min-width="120" show-overflow-tooltip col-type="Date" v-if="showCol('endDate')">
 				    <template slot-scope="scope">
-                            <mdpp-date type="date" placeholder="选择日期" show-style="tag" v-model="scope.row.endDate"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" :disabled="disabledJudge('endDate')"/>
+                            <mdp-date type="date" placeholder="选择日期" show-style="tag" v-model="scope.row.endDate"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" :disabled="disabledJudge('endDate')"/>
 				    </template>
 				</el-table-column>
 				<el-table-column prop="actEndDate"  label="实际结束任职时间" min-width="120" show-overflow-tooltip col-type="Date" v-if="showCol('actEndDate')">
 				    <template slot-scope="scope">
-                            <mdpp-date type="date" placeholder="选择日期" show-style="tag" v-model="scope.row.actEndDate"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" :disabled="disabledJudge('actEndDate')"/>
+                            <mdp-date type="date" placeholder="选择日期" show-style="tag" v-model="scope.row.actEndDate"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" :disabled="disabledJudge('actEndDate')"/>
 				    </template>
 				</el-table-column>
 				<el-table-column prop="enabled"  label="状态0-无效1-有效" min-width="120" show-overflow-tooltip col-type="String" v-if="showCol('enabled')">
@@ -67,7 +67,7 @@
 				</el-table-column>
 				<el-table-column prop="lastDate"  label="最后更新时间" min-width="120" show-overflow-tooltip col-type="Date" v-if="showCol('lastDate')">
 				    <template slot-scope="scope">
-                            <mdpp-date type="date" placeholder="选择日期" show-style="tag" v-model="scope.row.lastDate"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" :disabled="disabledJudge('lastDate')"/>
+                            <mdp-date type="date" placeholder="选择日期" show-style="tag" v-model="scope.row.lastDate"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" :disabled="disabledJudge('lastDate')"/>
 				    </template>
 				</el-table-column>
 				<el-table-column prop="master"  label="是否为主岗位0否1是" min-width="120" show-overflow-tooltip col-type="String" v-if="showCol('master')">
diff --git a/src/views/mdp/sys/userValidInfo/Index.vue b/src/views/mdp/sys/userValidInfo/Index.vue
index 011926c..3dad08a 100644
--- a/src/views/mdp/sys/userValidInfo/Index.vue
+++ b/src/views/mdp/sys/userValidInfo/Index.vue
@@ -84,12 +84,12 @@
 				</el-table-column>
 				<el-table-column prop="ctime"  label="新增时间" min-width="120" show-overflow-tooltip col-type="Date" v-if="showCol('ctime')">
 				    <template slot-scope="scope">
-                            <mdpp-date type="date" placeholder="选择日期" show-style="tag" v-model="scope.row.ctime"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" :disabled="disabledJudge('ctime')"/>
+                            <mdp-date type="date" placeholder="选择日期" show-style="tag" v-model="scope.row.ctime"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" :disabled="disabledJudge('ctime')"/>
 				    </template>
 				</el-table-column>
 				<el-table-column prop="ltime"  label="修改时间" min-width="120" show-overflow-tooltip col-type="Date" v-if="showCol('ltime')">
 				    <template slot-scope="scope">
-                            <mdpp-date type="date" placeholder="选择日期" show-style="tag" v-model="scope.row.ltime"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" :disabled="disabledJudge('ltime')"/>
+                            <mdp-date type="date" placeholder="选择日期" show-style="tag" v-model="scope.row.ltime"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" :disabled="disabledJudge('ltime')"/>
 				    </template>
 				</el-table-column> 
 				<el-table-column prop="isOrg"  label="是否为机构" min-width="120" show-overflow-tooltip col-type="String" v-if="showCol('isOrg')">