From 06a1ba4677336e23dfaa7d244278593d60bd06ce Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期一, 27 二月 2023 16:10:28 +0800
Subject: [PATCH] 1.项目上线部署
---
src/views/zzmx/chda.vue | 2
src/views/scgl/scdd.vue | 56 +++++++++---------
src/views/scgl/gd.vue | 46 +++++++-------
vue.config.js | 4
src/views/jcsz/jsqd.vue | 21 +++---
5 files changed, 65 insertions(+), 64 deletions(-)
diff --git a/src/views/jcsz/jsqd.vue b/src/views/jcsz/jsqd.vue
index ea8b5c2..2995be6 100644
--- a/src/views/jcsz/jsqd.vue
+++ b/src/views/jcsz/jsqd.vue
@@ -560,6 +560,7 @@
</div>
<div class="myCheckboxGroup">
+
<div
v-for="item in dialogFormRight.rightOperationArr"
:key="item.code"
@@ -567,7 +568,6 @@
class="myCheckbox"
@click="myCheckboxClick(item)"
>
-
<!-- <input-->
<!-- class="myCheckboxInput"-->
<!-- type="checkbox"-->
@@ -1387,15 +1387,16 @@
name: this.dialogFormRight.rightPCArr[0].name
})
}
- if (this.APPTrue) {
- this.dialogFormRight.rightOperationArr.push({
- isSelected1: appIsSelected1,
- isSelected2: appIsSelected2,
- code: this.dialogFormRight.rightAPPArr[0].code,
- flag: rightAPPArrFlag,
- name: this.dialogFormRight.rightAPPArr[0].name
- })
- }
+ //鑾辩鍜岀鑾辩壒鐨勬敞閲婃帀
+ // if (this.APPTrue) {
+ // this.dialogFormRight.rightOperationArr.push({
+ // isSelected1: appIsSelected1,
+ // isSelected2: appIsSelected2,
+ // code: this.dialogFormRight.rightAPPArr[0].code,
+ // flag: rightAPPArrFlag,
+ // name: this.dialogFormRight.rightAPPArr[0].name
+ // })
+ // }
if (this.PCTrue) {
this.dialogFormRight.rightPCArr[0].name = '鍏ㄩ儴'
if (this.rightFrom.usercode === 'S001') { // Admin绯荤粺绠＄悊鍛樿彍鍗曞仛鍒板彧澧炰笉鍑�
diff --git a/src/views/scgl/gd.vue b/src/views/scgl/gd.vue
index 5fb73da..7d97b28 100644
--- a/src/views/scgl/gd.vue
+++ b/src/views/scgl/gd.vue
@@ -620,29 +620,29 @@
</el-select>
</el-form-item>
</div>
- <el-form-item label="鏄惁鎺掔▼" prop="isAps">
- <el-radio-group v-model="dialogForm.isAps" style="width:200px" @change="changeIsAps">
- <el-radio key="Y" label="Y" value="Y">鏄�</el-radio>
- <el-radio key="N" label="N" value="N">鍚�</el-radio>
- </el-radio-group>
- </el-form-item>
- <el-form-item label="鐗╂枡娓呭崟" :prop="dialogForm.isAps==='Y'?'bomId':''">
- <el-select
- v-model="dialogForm.bomId"
- filterable
- :disabled="dialogForm.isAps==='N'"
- :popper-append-to-body="false"
- style="width: 200px;"
- placeholder="璇烽�夋嫨"
- >
- <el-option
- v-for="item in bomIdArr"
- :key="item.id"
- :label="item.version"
- :value="item.id"
- />
- </el-select>
- </el-form-item>
+<!-- <el-form-item label="鏄惁鎺掔▼" prop="isAps">-->
+<!-- <el-radio-group v-model="dialogForm.isAps" style="width:200px" @change="changeIsAps">-->
+<!-- <el-radio key="Y" label="Y" value="Y">鏄�</el-radio>-->
+<!-- <el-radio key="N" label="N" value="N">鍚�</el-radio>-->
+<!-- </el-radio-group>-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="鐗╂枡娓呭崟" :prop="dialogForm.isAps==='Y'?'bomId':''">-->
+<!-- <el-select-->
+<!-- v-model="dialogForm.bomId"-->
+<!-- filterable-->
+<!-- :disabled="dialogForm.isAps==='N'"-->
+<!-- :popper-append-to-body="false"-->
+<!-- style="width: 200px;"-->
+<!-- placeholder="璇烽�夋嫨"-->
+<!-- >-->
+<!-- <el-option-->
+<!-- v-for="item in bomIdArr"-->
+<!-- :key="item.id"-->
+<!-- :label="item.version"-->
+<!-- :value="item.id"-->
+<!-- />-->
+<!-- </el-select>-->
+<!-- </el-form-item>-->
<el-form-item label="璁″垝寮�濮嬫椂闂�" prop="planstartdate">
<el-date-picker
v-model="dialogForm.planstartdate"
diff --git a/src/views/scgl/scdd.vue b/src/views/scgl/scdd.vue
index a54b462..b40474d 100644
--- a/src/views/scgl/scdd.vue
+++ b/src/views/scgl/scdd.vue
@@ -272,18 +272,18 @@
<div v-else>/</div>
</template>
</el-table-column>
- <el-table-column
- prop="saleOrderDeliveryDate"
- label="棰勮浜や粯鏃ユ湡"
- sortable="custom"
- show-tooltip-when-overflow
- width="130"
- >
- <template slot-scope="{row}">
- <div v-if="row.saleOrderDeliveryDate">{{ row.saleOrderDeliveryDate.substring(0, 11) }}</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
+<!-- <el-table-column-->
+<!-- prop="saleOrderDeliveryDate"-->
+<!-- label="棰勮浜や粯鏃ユ湡"-->
+<!-- sortable="custom"-->
+<!-- show-tooltip-when-overflow-->
+<!-- width="130"-->
+<!-- >-->
+<!-- <template slot-scope="{row}">-->
+<!-- <div v-if="row.saleOrderDeliveryDate">{{ row.saleOrderDeliveryDate.substring(0, 11) }}</div>-->
+<!-- <div v-else>/</div>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
<el-table-column
show-tooltip-when-overflow
prop="createuser"
@@ -412,19 +412,19 @@
style="width: 200px"
/>
</el-form-item>
- <el-form-item label="棰勮浜や粯鏃ユ湡" prop="saleOrderDeliveryDate">
- <el-date-picker
- v-model="dialogForm.saleOrderDeliveryDate"
- type="date"
- size="mini"
- :clearable="false"
- class="dateMini"
- :picker-options="pickerOptions"
- format="yyyy-MM-dd"
- placeholder="閫夋嫨鏃ユ湡"
- :disabled="dialogForm.saleOrderDeliveryDateIsDisabled"
- />
- </el-form-item>
+<!-- <el-form-item label="棰勮浜や粯鏃ユ湡" prop="saleOrderDeliveryDate">-->
+<!-- <el-date-picker-->
+<!-- v-model="dialogForm.saleOrderDeliveryDate"-->
+<!-- type="date"-->
+<!-- size="mini"-->
+<!-- :clearable="false"-->
+<!-- class="dateMini"-->
+<!-- :picker-options="pickerOptions"-->
+<!-- format="yyyy-MM-dd"-->
+<!-- placeholder="閫夋嫨鏃ユ湡"-->
+<!-- :disabled="dialogForm.saleOrderDeliveryDateIsDisabled"-->
+<!-- />-->
+<!-- </el-form-item>-->
</el-form>
<span slot="footer" class="dialog-footer">
@@ -446,7 +446,7 @@
<script>
import Pagination from '@/components/Pagination'
import { ClosedErpOrder, ErpOrderSearch, MarkSaveErpOrder } from '@/api/scgl'
-import { handleDatetime } from '@/utils/global'
+import { handleDatetime, handleDatetime2 } from '@/utils/global'
import { SeaveSearchErpOrder } from '@/api/ErpSyncMes'
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
@@ -519,7 +519,7 @@
markqty: '', // 涓嬪崟鏁伴噺
ordernum: '', // 涓嬪崟鍗曟暟
relse_qty: '', // 宸蹭笅鍗曟暟閲�
- saleOrderDeliveryDate: '', // 棰勮浜や粯鏃ユ湡
+ saleOrderDeliveryDate: handleDatetime2(new Date()), // 棰勮浜や粯鏃ユ湡
saleOrderDeliveryDateIsDisabled: false// 棰勮浜や粯鏃ユ湡瀛楁鏄惁鍙慨鏀�
},
@@ -739,7 +739,7 @@
this.dialogForm.warehousecode = ''
this.dialogForm.warehousename = ''
- this.dialogForm.saleOrderDeliveryDate = ''
+ this.dialogForm.saleOrderDeliveryDate = handleDatetime2(new Date())
this.dialogForm.erpqty = ''
this.dialogForm.markqty = ''
diff --git a/src/views/zzmx/chda.vue b/src/views/zzmx/chda.vue
index 9f8c7ca..70b7f0a 100644
--- a/src/views/zzmx/chda.vue
+++ b/src/views/zzmx/chda.vue
@@ -416,7 +416,7 @@
</el-form-item>
</el-form>
- <el-collapse>
+ <el-collapse v-if="false">
<el-collapse-item title="涓�鑷存�� Consistency" name="1">
<template slot="title">
<div>
diff --git a/vue.config.js b/vue.config.js
index b1f42c8..1f0a9fa 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -52,8 +52,8 @@
},
proxy: {
[process.env.VUE_APP_BASE_API]: {
- // target: 'http://121.196.36.24:8001', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 鏈湴寮�鍙戞湇鍔″櫒
- target: 'http://192.168.1.102:8001', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 鑾辩
+ target: 'http://121.196.36.24:8011', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 鏈湴寮�鍙戞湇鍔″櫒
+ // target: 'http://192.168.1.102:8001', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 鑾辩
changeOrigin: true, // 璇锋眰璺ㄥ煙鏃讹紝闇� 閰嶇疆姝ら」
pathRewrite: { // 璺緞閲嶅啓,鏇挎崲target涓殑璇锋眰鍦板潃
--
Gitblit v1.9.3