liuyanpeng пре 2 година
родитељ
комит
2bfe4a9292

+ 4 - 4
package.json

@@ -1,7 +1,7 @@
 {
   "name": "client-trace-v3",
   "description": "client-trace-v3",
-  "version": "1.0.24",
+  "version": "1.0.25",
   "author": "yangzhijie <yangzhijie1488@163.com>",
   "scripts": {
     "dev": "webpack serve --config ./webpack.dev.js",
@@ -14,8 +14,8 @@
     "dist"
   ],
   "peerDependencies": {
-    "ant-design-vue": "^3.2.15",
-    "pc-component-v3": "^1.0.69",
+    "ant-design-vue": "^4.2.1",
+    "pc-component-v3": "^1.0.83",
     "v-tooltip": "^4.0.0-beta.17",
     "vue-select": "^4.0.0-beta.6",
     "vuedraggable": "^4.1.0"
@@ -51,6 +51,6 @@
   },
   "repository": {
     "type": "http",
-    "url": "http://prodog.leanwo.com:3000/prodog-client-2023/client-eam-v3.git"
+    "url": "http://a.leanwo.com:3000/prodog-client-2023/client-eam-v3.git"
   }
 }

+ 1 - 1
src/main.js

@@ -13,7 +13,7 @@ import Antd from 'ant-design-vue';
 import 'jquery';
 
 
-import 'ant-design-vue/dist/antd.css';
+// import 'ant-design-vue/dist/antd.css';
 
 
 import { langZhCn } from './lang/zh-CN.js';

+ 9 - 14
src/trace/TraceCreate.vue

@@ -65,15 +65,15 @@
         </div>
         <div class="form-group">
           <label>完成时间</label><br />
-          <a-config-provider :locale="locale">
-            <a-date-picker
-              v-model:value="planFinishedDate"
-              style="width: 100%"
-              :show-today="false"
-              placeholder="请选择完成日期"
-              @change="getDate"
-            />
-          </a-config-provider>
+          <!-- <a-config-provider :locale="locale"> -->
+          <a-date-picker
+            v-model:value="planFinishedDate"
+            style="width: 100%"
+            :show-today="false"
+            placeholder="请选择完成日期"
+            @change="getDate"
+          />
+          <!-- </a-config-provider> -->
         </div>
         <button
           style="width: 100%; background-color: #007aff; color: white"
@@ -97,10 +97,6 @@ import Treeselect from '../widget/TreeSelect.vue';
 import ATreeselect from '../widget/ATreeSelect.vue';
 import AudioField from '../widget/AudioField.vue';
 import { message } from 'ant-design-vue';
-import zhCN from 'ant-design-vue/es/locale/zh_CN';
-import dayjs from 'dayjs';
-import 'dayjs/locale/zh-cn';
-dayjs.locale('zh-cn');
 export default {
   components: {
     UpladFile,
@@ -123,7 +119,6 @@ export default {
       projectTaskDtos: [], //项目任务时间点
       srcArray: [],
       loading: false,
-      locale: zhCN,
     };
   },
   watch: {

+ 7 - 14
src/trace/TraceTimeLineCreate.vue

@@ -36,15 +36,13 @@
 
         <div class="form-group">
           <label for="exampleInputEmail2">截止时间</label>
-          <a-config-provider :locale="locale">
-            <a-date-picker
-              v-model:value="planFinishedDate"
-              style="width: 100%"
-              :show-today="false"
-              placeholder="请选择日期"
-              @change="getDate"
-            />
-          </a-config-provider>
+          <a-date-picker
+            v-model:value="planFinishedDate"
+            style="width: 100%"
+            :show-today="false"
+            placeholder="请选择日期"
+            @change="getDate"
+          />
 
           <!-- <Date v-model="traceTimeLine.endDate" style="width: 100%" /> -->
         </div>
@@ -69,10 +67,6 @@
 <script>
 import { Notify } from 'pc-component-v3';
 import Common from '../common/Common.js';
-import zhCN from 'ant-design-vue/es/locale/zh_CN';
-import dayjs from 'dayjs';
-import 'dayjs/locale/zh-cn';
-dayjs.locale('zh-cn');
 export default {
   components: {},
   data: function () {
@@ -89,7 +83,6 @@ export default {
       loading: false,
       user:'',
       allUsers: [],
-      locale: zhCN,
       planFinishedDate: '',
     };
   },

+ 7 - 9
src/trace/TraceTimeLineEdit.vue

@@ -38,15 +38,13 @@
 
         <div class="form-group">
           <label for="exampleInputEmail2">截止时间</label>
-          <a-config-provider :locale="locale">
-            <a-date-picker
-              v-model:value="planFinishedDate"
-              style="width: 100%"
-              :show-today="false"
-              placeholder="请选择日期"
-              @change="getDate"
-            />
-          </a-config-provider>
+          <a-date-picker
+            v-model:value="planFinishedDate"
+            style="width: 100%"
+            :show-today="false"
+            placeholder="请选择日期"
+            @change="getDate"
+          />
           <!-- <Date v-model="traceTimeLine.endDate" style="width: 100%" /> -->
         </div>
         <div style="margin-top: 10px">

+ 7 - 9
src/trace/TraceUpdate.vue

@@ -71,15 +71,13 @@
 
         <div class="form-group">
           <label>完成时间</label>
-          <a-config-provider :locale="locale">
-            <a-date-picker
-              v-model:value="planFinishedDate"
-              style="width: 100%"
-              :show-today="false"
-              placeholder="请选择完成日期"
-              @change="getDate"
-            />
-          </a-config-provider>
+          <a-date-picker
+            v-model:value="planFinishedDate"
+            style="width: 100%"
+            :show-today="false"
+            placeholder="请选择完成日期"
+            @change="getDate"
+          />
           <!-- <Date
             v-model="traceDto.planFinishedDate"
             style="width: 100%"