Merge remote-tracking branch 'origin/master'

jp-ui/.env.production

@@ -6,7 +6,7 @@ VITE_APP_API=
 
 #Jeeplus快速开发平台/后台地址, 使用多租户时，相对地址，解决跨域问题。
 #VITE_APP_BASE= '/api'
-VITE_APP_BASE = '/gw'
+VITE_APP_BASE = '/gwapi'
 
 # 是否在打包时开启压缩，支持 gzip 和 brotli
 VITE_BUILD_COMPRESS = gzip

jp-ui/src/views/circulation2/GwCirculationCard2Form.vue

@@ -47,8 +47,8 @@
                 <el-date-picker
                       style="width: 100%;"
                       v-model="inputForm.writtenTime"
-                      type="datetime"
-                      value-format="YYYY-MM-DD HH:mm:ss"
+                      type="date"
+					  value-format="YYYY-MM-DD HH:mm:ss"
                       placeholder="选择日期时间">
                     </el-date-picker>
            </el-form-item>
@@ -60,7 +60,7 @@
                 <el-date-picker
                       style="width: 100%;"
                       v-model="inputForm.receivingTime"
-                      type="datetime"
+                      type="date"
                       value-format="YYYY-MM-DD HH:mm:ss"
                       placeholder="选择日期时间">
                     </el-date-picker>
@@ -160,7 +160,11 @@
           if (method === 'edit' || method === 'view') { // 修改或者查看
             this.loading = true
             gwCirculationCard2Service.queryById(this.inputForm.id).then((data) => {
+
+				data.writtenTime="2024-01-01";
+				data.receivingTime="2024-01-01";
               this.inputForm = this.recover(this.inputForm, data)
+
               this.loading = false
             })
           }

jp-ui/src/views/circulation2/GwCirculationCard2Form2.vue

@@ -47,7 +47,7 @@
                 <el-date-picker
                       style="width: 100%;"
                       v-model="inputForm.writtenTime"
-                      type="datetime"
+                      type="date"
                       value-format="YYYY-MM-DD HH:mm:ss"
                       placeholder="选择日期时间">
                     </el-date-picker>
@@ -60,7 +60,7 @@
                 <el-date-picker
                       style="width: 100%;"
                       v-model="inputForm.receivingTime"
-                      type="datetime"
+                      type="date"
                       value-format="YYYY-MM-DD HH:mm:ss"
                       placeholder="选择日期时间">
                     </el-date-picker>
@@ -145,6 +145,7 @@
 
 <script>
   import gwCirculationCard2Service from '@/api/circulation2/gwCirculationCard2Service'
+  import gwFlowService from '@/api/gwflow/gwFlowService'
   export default {
     data () {
       return {
@@ -202,7 +203,7 @@
             })
 
 
-			gwCirculationCard2Service.queryByGwId(this.inputForm.id).then(data => {
+			gwFlowService.queryByGwId(this.inputForm.id).then(data => {
 
 				// data.forEach(item => {
 				// 	if (item.state == 0) this.downList.push(item)

jp-ui/src/views/circulation2/GwCirculationCard2FormYb.vue

@@ -218,7 +218,7 @@
             })
 
 
-			gwCirculationCard2Service.queryByGwId(this.inputForm.id).then(data => {
+			gwFlowService.queryByGwId(this.inputForm.id).then(data => {
 
 				if (data.length > 1) this.one = false
 				if(this.one) {
@@ -236,7 +236,6 @@
 
 				let user = JSON.parse(window.localStorage.getItem('USER_INFO'))
 				let role = user.roleNames
-				console.log("taa"+role);
 
 				let gw = data.filter(item => {
 					return item.nextUser == user.id && item.state == 1

jp-ui/src/views/circulation2/fileCard.vue

@@ -36,7 +36,7 @@
 								{{item.content}}
 							</view>
 							<view class="flex " style="line-height: 20px;">
-								<el-image :src="item.signfj" width="80px" height="20px"></el-image>
+								<el-image :src="item.signfj" style="width: 80px; "></el-image>
 								{{item.updateTime}}
 							</view>
 						</view>
@@ -52,7 +52,7 @@
 											{{leader.content}}
 										</view>
 										<view class="flex " style="line-height: 20px;">
-											<el-image :src="leader.signfj" width="80px" height="20px"></el-image>
+											<el-image :src="leader.signfj" style="width: 80px; "></el-image>
 											{{leader.updateTime}}
 										</view>
 									</view>
@@ -68,7 +68,7 @@
 											{{item.content}}
 										</view>
 										<view class="flex " style="line-height: 20px;">
-											<el-image :src="item.signfj" width="80px" height="20px"></el-image>
+											<el-image :src="item.signfj" style="width: 80px; "></el-image>
 											{{item.updateTime}}
 										</view>
 									</view>
@@ -109,6 +109,7 @@
 <script>
 
 	import gwCirculationCard2Service from '@/api/circulation2/gwCirculationCard2Service'
+	import gwFlowService from '@/api/gwflow/gwFlowService'
 
 	export default {
 		mounted() {
@@ -117,7 +118,7 @@
 				this.inputForm.receivingTime = this.inputForm.receivingTime.substring(5, 10)
 
 			})
-			gwCirculationCard2Service.queryByGwId(this.gwId).then(data => {
+			gwFlowService.queryByGwId(this.gwId).then(data => {
 
 				data.forEach(item => {
 					if (item.which == 0 && item.state == 0) {
@@ -381,7 +382,7 @@
 		display: flex;
 		    flex-direction: column;
 	}
-	
+
 	.grid-content-left2 {
 	  border-left: 1px solid #333333;
 	  border-top: 1px solid #333333;