Przeglądaj źródła

fix: 工单确认bug

32197351@qq.com 2 lat temu
rodzic
commit
5c0f93257c

+ 2 - 2
itdmWeb/.env.development

@@ -1,5 +1,5 @@
 NODE_ENV=development
-VUE_APP_API_BASE_URL=http://localhost:8080/itdmServer
+VUE_APP_API_BASE_URL=http://192.168.2.151:8080/itdmServer
 VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas
 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview
 
@@ -7,4 +7,4 @@ VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview
 VUE_APP_SUB_jeecg-app-1 = '//localhost:8092'
 
 
-VUE_APP_ONLYOFFICE_URL=http://192.168.1.26
+VUE_APP_ONLYOFFICE_URL=http://192.168.2.146

+ 17 - 10
itdmWeb/src/views/module-iTDM/gongdandetail/modules/ItdmGongdanDetailForm.vue

@@ -41,14 +41,14 @@
           <a-col :span="24">
             <a-form-model-item label="实绩试验开始时间" :labelCol="labelCol" :wrapperCol="wrapperCol"
                                prop="shijiStartTime">
-              <a-time-picker placeholder="请选择实绩试验开始时间" v-model="model.shijiStartTime"
+              <a-time-picker placeholder="请选择实绩试验开始时间" v-model="model.shijiStartTime" :valueFormat="'HH:mm'"
                       :format="'HH:mm'" style="width: 100%" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="实绩试验结束时间" :labelCol="labelCol" :wrapperCol="wrapperCol"
                                prop="shijiEndTime">
-              <a-time-picker placeholder="请选择实绩试验结束时间" v-model="model.shijiEndTime"
+              <a-time-picker placeholder="请选择实绩试验结束时间" v-model="model.shijiEndTime" :valueFormat="'HH:mm'"
                       :format="'HH:mm'" style="width: 100%" />
             </a-form-model-item>
           </a-col>
@@ -134,18 +134,27 @@ export default {
     },
     edit(record) {
       this.model = Object.assign({}, record)
-      this.model.shijiStartTime=moment(this.model.shijiStartTime.getTime()).format("HH:mm")
-      this.model.shijiEndTime=moment(this.model.shijiEndTime.getTime()).format("HH:mm")
-
-
       var select={id:record.woId}
       getAction('/itdmGongdanMaster/itdmGongdanMaster/queryById', select).then((res) => {
         if (res.success) {
-          console.log("xxxxxxxxxxxxxxxxxxx")
-          console.log(res.result)
           this.model.shijiShebeiId=res.result.shebeiId
           this.model.shijiShiiyanType=res.result.shiiyanType
+          this.model.chuanganqi=res.result.chuanganqi
+
+
+
+
 
+
+        }
+      })
+
+      var selec1t={id:record.id}
+      getAction('/itdmGongdanDetail/itdmGongdanDetail/queryById', selec1t).then((res) => {
+        if (res.success) {
+          this.model.shijiWorkDate=res.result.workDate
+          this.model.shijiStartTime=res.result.startTime
+          this.model.shijiEndTime=res.result.endTime
         }
       })
 
@@ -166,8 +175,6 @@ export default {
             httpurl += this.url.edit
             method = 'put'
           }
-          this.model.shijiStartTime=moment(this.model.shijiStartTime).format("HH:mm")
-          this.model.shijiEndTime=moment(this.model.shijiEndTime).format("HH:mm")
 
           httpAction(httpurl, this.model, method).then((res) => {
             if (res.success) {