wenhongquan 2 年之前
父節點
當前提交
bbe31484be
共有 3 個文件被更改,包括 6 次插入5 次删除
  1. 2 2
      src/views/mb/task/add/index.vue
  2. 2 1
      src/views/task/list/index.vue
  3. 2 2
      vite.config.js

+ 2 - 2
src/views/mb/task/add/index.vue

@@ -382,7 +382,7 @@ const onConfirm3 = (value) => {
 };
 const onConfirm4 = () => {
   showPicker4.value = false;
-  taskinfo.value.taskReqCompleteTime = moment(taskdate1.value).format(
+  taskinfo.value.taskReqCompleteTime = moment(taskdate1.value==undefined?0: taskdate1.value).format(
     "YYYY-MM-DD HH:mm:ss"
   );
 };
@@ -433,7 +433,7 @@ const taskinfo = ref({
   taskOtherId: null,
   taskTime: null,
   taskArea: "1",
-  taskReqCompleteTime: null,
+  taskReqCompleteTime: "",
   status: 1,
   taskId: null,
   remark: "",

+ 2 - 1
src/views/task/list/index.vue

@@ -414,9 +414,10 @@ const ontaskadd = async () => {
     taskobj.taskDeptRange instanceof Array
       ? taskobj.taskDeptRange.join(",")
       : "";
-  taskobj.taskReqCompleteTime = taskobj.taskReqCompleteTime
+  taskobj.taskReqCompleteTime = taskobj.taskReqCompleteTime==null
     ? ""
     : moment(taskobj.taskReqCompleteTime).format("YYYY-MM-DD HH:mm:ss");
+
   console.log(taskobj);
   loading.value = true;
 

+ 2 - 2
vite.config.js

@@ -38,8 +38,8 @@ export default defineConfig(({ mode, command }) => {
             proxy: {
                 // 'http://nnbpbg.xt.wenhq.top:8083'
                 "/dev-api": {
-                    // target: "http://localhost:8080/api",
-                    target:"http://nnbpbg.xt.wenhq.top:8083/api",
+                    target: "http://localhost:8080/api",
+                    // target:"http://nnbpbg.xt.wenhq.top:8083/api",
                     changeOrigin: true,
                     rewrite: (p) => p.replace(/^\/dev-api/, ""),
                 },