From 7413690d1c0fcc71dd03f2781111a2b5127e76e3 Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期三, 28 十月 2026 13:17:04 +0800
Subject: [PATCH] 新聚工贸最新修改
---
src/pages/basicData/customerFile/edit.vue | 4
src/pages/basicData/supplierManage/index.vue | 4
src/pages/sales/salesAccount/goOut.vue | 7 +
src/config.js | 4
src/manifest.json | 170 +++++++++++++++++-----------------
src/pages/productionManagement/productionReporting/ledger.vue | 31 ------
src/pages/basicData/customerFile/index.vue | 4
src/pages/sales/salesAccount/out.vue | 4
src/pages/basicData/supplierManage/edit.vue | 4
src/pages/cooperativeOffice/clientVisit/index.vue | 4
src/pages/sales/salesQuotation/edit.vue | 3
src/pages/procurementManagement/procurementLedger/detail.vue | 6
12 files changed, 117 insertions(+), 128 deletions(-)
diff --git a/src/config.js b/src/config.js
index 9fe25a9..df3a49a 100644
--- a/src/config.js
+++ b/src/config.js
@@ -1,7 +1,7 @@
// 搴旂敤鍏ㄥ眬閰嶇疆
const config = {
- baseUrl: "http://1.15.17.182:9116",
- fileUrl: "http://1.15.17.182:9115",
+ baseUrl: "http://36.213.90.123:9015",
+ fileUrl: "http://36.213.90.123:9016",
// 搴旂敤淇℃伅
appInfo: {
// 搴旂敤鍚嶇О
diff --git a/src/manifest.json b/src/manifest.json
index a350518..2e86287 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -1,36 +1,36 @@
{
- "name" : "鎰忓崥鍑俊",
- "appid" : "__UNI__9BDA18B",
- "description" : "",
- "versionName" : "1.1.5",
- "versionCode" : 100,
- "transformPx" : false,
+ "name": "鏂拌仛宸ヨ锤",
+ "appid": "__UNI__0E0D28E",
+ "description": "",
+ "versionName": "1.1.5",
+ "versionCode": 100,
+ "transformPx": false,
/* 5+App鐗规湁鐩稿叧 */
- "app-plus" : {
- "compatible" : {
- "usingComponents" : true,
- "ignoreVersion" : true
+ "app-plus": {
+ "compatible": {
+ "usingComponents": true,
+ "ignoreVersion": true
},
- "usingComponents" : true,
- "nvueStyleCompiler" : "uni-app",
- "compilerVersion" : 3,
- "splashscreen" : {
- "alwaysShowBeforeRender" : true,
- "waiting" : true,
- "autoclose" : true,
- "delay" : 0
+ "usingComponents": true,
+ "nvueStyleCompiler": "uni-app",
+ "compilerVersion": 3,
+ "splashscreen": {
+ "alwaysShowBeforeRender": true,
+ "waiting": true,
+ "autoclose": true,
+ "delay": 0
},
/* 妯″潡閰嶇疆 */
- "modules" : {
- "Camera" : {},
- "Barcode" : {},
- "Maps" : {}
+ "modules": {
+ "Camera": {},
+ "Barcode": {},
+ "Maps": {}
},
/* 搴旂敤鍙戝竷淇℃伅 */
- "distribute" : {
+ "distribute": {
/* android鎵撳寘閰嶇疆 */
- "android" : {
- "permissions" : [
+ "android": {
+ "permissions": [
"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
@@ -55,88 +55,88 @@
]
},
/* ios鎵撳寘閰嶇疆 */
- "ios" : {
- "dSYMs" : false,
- "plist" : {
- "NSLocationWhenInUseUsageDescription" : "闇�瑕佽幏鍙栨偍鐨勪綅缃俊鎭潵璁板綍瀹㈡埛鎷滆鍦扮偣",
- "NSLocationAlwaysAndWhenInUseUsageDescription" : "闇�瑕佽幏鍙栨偍鐨勪綅缃俊鎭潵璁板綍瀹㈡埛鎷滆鍦扮偣"
+ "ios": {
+ "dSYMs": false,
+ "plist": {
+ "NSLocationWhenInUseUsageDescription": "闇�瑕佽幏鍙栨偍鐨勪綅缃俊鎭潵璁板綍瀹㈡埛鎷滆鍦扮偣",
+ "NSLocationAlwaysAndWhenInUseUsageDescription": "闇�瑕佽幏鍙栨偍鐨勪綅缃俊鎭潵璁板綍瀹㈡埛鎷滆鍦扮偣"
}
},
/* SDK閰嶇疆 */
- "sdkConfigs" : {
- "push" : {
- "unipush" : {
- "icons" : {
- "small" : {
- "ldpi" : "D:/xindao/wenjian/img/logo/app.png"
+ "sdkConfigs": {
+ "push": {
+ "unipush": {
+ "icons": {
+ "small": {
+ "ldpi": "D:/xindao/wenjian/img/logo/app.png"
}
},
- "offline" : false
+ "offline": false
}
},
- "maps" : {
- "amap" : {
- "name" : "amap_18330707920ae9zOwCD",
- "appkey_ios" : "c2b4e3889ab4cb9468e9c8ae4f3ab53f",
- "appkey_android" : "c2b4e3889ab4cb9468e9c8ae4f3ab53f"
+ "maps": {
+ "amap": {
+ "name": "amap_18330707920ae9zOwCD",
+ "appkey_ios": "c2b4e3889ab4cb9468e9c8ae4f3ab53f",
+ "appkey_android": "c2b4e3889ab4cb9468e9c8ae4f3ab53f"
}
}
},
- "icons" : {
- "android" : {
- "hdpi" : "unpackage/res/icons/72x72.png",
- "xhdpi" : "unpackage/res/icons/96x96.png",
- "xxhdpi" : "unpackage/res/icons/144x144.png",
- "xxxhdpi" : "unpackage/res/icons/192x192.png"
+ "icons": {
+ "android": {
+ "hdpi": "unpackage/res/icons/72x72.png",
+ "xhdpi": "unpackage/res/icons/96x96.png",
+ "xxhdpi": "unpackage/res/icons/144x144.png",
+ "xxxhdpi": "unpackage/res/icons/192x192.png"
},
- "ios" : {
- "appstore" : "unpackage/res/icons/1024x1024.png",
- "ipad" : {
- "app" : "unpackage/res/icons/76x76.png",
- "app@2x" : "unpackage/res/icons/152x152.png",
- "notification" : "unpackage/res/icons/20x20.png",
- "notification@2x" : "unpackage/res/icons/40x40.png",
- "proapp@2x" : "unpackage/res/icons/167x167.png",
- "settings" : "unpackage/res/icons/29x29.png",
- "settings@2x" : "unpackage/res/icons/58x58.png",
- "spotlight" : "unpackage/res/icons/40x40.png",
- "spotlight@2x" : "unpackage/res/icons/80x80.png"
+ "ios": {
+ "appstore": "unpackage/res/icons/1024x1024.png",
+ "ipad": {
+ "app": "unpackage/res/icons/76x76.png",
+ "app@2x": "unpackage/res/icons/152x152.png",
+ "notification": "unpackage/res/icons/20x20.png",
+ "notification@2x": "unpackage/res/icons/40x40.png",
+ "proapp@2x": "unpackage/res/icons/167x167.png",
+ "settings": "unpackage/res/icons/29x29.png",
+ "settings@2x": "unpackage/res/icons/58x58.png",
+ "spotlight": "unpackage/res/icons/40x40.png",
+ "spotlight@2x": "unpackage/res/icons/80x80.png"
},
- "iphone" : {
- "app@2x" : "unpackage/res/icons/120x120.png",
- "app@3x" : "unpackage/res/icons/180x180.png",
- "notification@2x" : "unpackage/res/icons/40x40.png",
- "notification@3x" : "unpackage/res/icons/60x60.png",
- "settings@2x" : "unpackage/res/icons/58x58.png",
- "settings@3x" : "unpackage/res/icons/87x87.png",
- "spotlight@2x" : "unpackage/res/icons/80x80.png",
- "spotlight@3x" : "unpackage/res/icons/120x120.png"
+ "iphone": {
+ "app@2x": "unpackage/res/icons/120x120.png",
+ "app@3x": "unpackage/res/icons/180x180.png",
+ "notification@2x": "unpackage/res/icons/40x40.png",
+ "notification@3x": "unpackage/res/icons/60x60.png",
+ "settings@2x": "unpackage/res/icons/58x58.png",
+ "settings@3x": "unpackage/res/icons/87x87.png",
+ "spotlight@2x": "unpackage/res/icons/80x80.png",
+ "spotlight@3x": "unpackage/res/icons/120x120.png"
}
}
}
}
},
/* 蹇簲鐢ㄧ壒鏈夌浉鍏� */
- "quickapp" : {},
+ "quickapp": {},
/* 灏忕▼搴忕壒鏈夌浉鍏� */
- "mp-weixin" : {
- "appid" : "",
- "setting" : {
- "urlCheck" : false
+ "mp-weixin": {
+ "appid": "",
+ "setting": {
+ "urlCheck": false
},
- "usingComponents" : true
+ "usingComponents": true
},
- "mp-alipay" : {
- "usingComponents" : true
+ "mp-alipay": {
+ "usingComponents": true
},
- "mp-baidu" : {
- "usingComponents" : true
+ "mp-baidu": {
+ "usingComponents": true
},
- "mp-toutiao" : {
- "usingComponents" : true
+ "mp-toutiao": {
+ "usingComponents": true
},
- "uniStatistics" : {
- "enable" : false
+ "uniStatistics": {
+ "enable": false
},
- "vueVersion" : "3"
-}
+ "vueVersion": "3"
+}
\ No newline at end of file
diff --git a/src/pages/basicData/customerFile/edit.vue b/src/pages/basicData/customerFile/edit.vue
index c10973e..9ffd15c 100644
--- a/src/pages/basicData/customerFile/edit.vue
+++ b/src/pages/basicData/customerFile/edit.vue
@@ -200,8 +200,8 @@
};
const customerTypeActions = [
- { name: "闆跺敭瀹㈡埛", value: "闆跺敭瀹㈡埛" },
- { name: "缁忛攢鍟嗗鎴�", value: "缁忛攢鍟嗗鎴�" },
+ { name: "涓夊ぇ娌�", value: "涓夊ぇ娌�" },
+ { name: "澶栭攢", value: "澶栭攢" },
];
const pageTitle = computed(() =>
diff --git a/src/pages/basicData/customerFile/index.vue b/src/pages/basicData/customerFile/index.vue
index 1d6fb9d..1b81e48 100644
--- a/src/pages/basicData/customerFile/index.vue
+++ b/src/pages/basicData/customerFile/index.vue
@@ -104,8 +104,8 @@
const tabList = reactive([
{ name: "鍏ㄩ儴瀹㈡埛", value: "" },
- { name: "闆跺敭瀹㈡埛", value: "闆跺敭瀹㈡埛" },
- { name: "缁忛攢鍟嗗鎴�", value: "缁忛攢鍟嗗鎴�" },
+ { name: "涓夊ぇ娌�", value: "涓夊ぇ娌�" },
+ { name: "澶栭攢", value: "澶栭攢" },
]);
const tabValue = ref(0);
diff --git a/src/pages/basicData/supplierManage/edit.vue b/src/pages/basicData/supplierManage/edit.vue
index c890e88..894b5c9 100644
--- a/src/pages/basicData/supplierManage/edit.vue
+++ b/src/pages/basicData/supplierManage/edit.vue
@@ -21,6 +21,9 @@
<up-form-item label="璐﹀彿" prop="bankAccountNum" required>
<up-input v-model="form.bankAccountNum" placeholder="璇疯緭鍏�" clearable />
</up-form-item>
+ <up-form-item label="閾惰仈琛屽彿" prop="bankCode">
+ <up-input v-model="form.bankCode" placeholder="璇疯緭鍏�" clearable />
+ </up-form-item>
<up-form-item label="鑱旂郴浜�" prop="contactUserName">
<up-input v-model="form.contactUserName" placeholder="璇疯緭鍏�" clearable />
</up-form-item>
@@ -91,6 +94,7 @@
companyPhone: "",
bankAccountName: "",
bankAccountNum: "",
+ bankCode: "",
contactUserName: "",
contactUserPhone: "",
maintainUserId: "",
diff --git a/src/pages/basicData/supplierManage/index.vue b/src/pages/basicData/supplierManage/index.vue
index 24aadc8..f35a09d 100644
--- a/src/pages/basicData/supplierManage/index.vue
+++ b/src/pages/basicData/supplierManage/index.vue
@@ -60,6 +60,10 @@
<text class="detail-value">{{ item.contactUserPhone || "-" }}</text>
</view>
<view class="detail-row">
+ <text class="detail-label">閾惰仈琛屽彿</text>
+ <text class="detail-value">{{ item.bankCode || "-" }}</text>
+ </view>
+ <view class="detail-row">
<text class="detail-label">缁存姢浜�</text>
<text class="detail-value">{{ item.maintainUserName || "-" }}</text>
</view>
diff --git a/src/pages/cooperativeOffice/clientVisit/index.vue b/src/pages/cooperativeOffice/clientVisit/index.vue
index b8f2358..523a516 100644
--- a/src/pages/cooperativeOffice/clientVisit/index.vue
+++ b/src/pages/cooperativeOffice/clientVisit/index.vue
@@ -83,12 +83,12 @@
@click="editVisit(item)">
缂栬緫
</u-button>
- <!-- <u-button type="error"
+ <u-button type="error"
size="small"
class="action-btn"
@click="deleteVisit(item)">
鍒犻櫎
- </u-button> -->
+ </u-button>
</view>
</view>
</view>
diff --git a/src/pages/procurementManagement/procurementLedger/detail.vue b/src/pages/procurementManagement/procurementLedger/detail.vue
index 397d863..21e86d9 100644
--- a/src/pages/procurementManagement/procurementLedger/detail.vue
+++ b/src/pages/procurementManagement/procurementLedger/detail.vue
@@ -710,7 +710,7 @@
showInvoiceTypePicker.value = false;
};
- // 鏍煎紡鍖栧嚱鏁� - 鍥哄畾涓や綅灏忔暟
+ // 閲戦鍥哄畾涓や綅灏忔暟锛岄噰璐暟閲忎繚鐣欎笁浣嶅皬鏁�
const formatTaxPrice = idx => {
if (productData.value[idx].taxInclusiveUnitPrice) {
const value = parseFloat(productData.value[idx].taxInclusiveUnitPrice);
@@ -755,7 +755,7 @@
if (productData.value[idx].quantity) {
const value = parseFloat(productData.value[idx].quantity);
if (!isNaN(value)) {
- productData.value[idx].quantity = value.toFixed(2);
+ productData.value[idx].quantity = value.toFixed(3);
}
}
if (!productData.value[currentProductIndex.value].taxRate) {
@@ -1500,4 +1500,4 @@
color: #3b82f6;
font-size: 14px;
}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/pages/productionManagement/productionReporting/ledger.vue b/src/pages/productionManagement/productionReporting/ledger.vue
index fb5d1dd..ce7695a 100644
--- a/src/pages/productionManagement/productionReporting/ledger.vue
+++ b/src/pages/productionManagement/productionReporting/ledger.vue
@@ -94,11 +94,6 @@
plain
text="鏌ョ湅鎶曞叆"
@click="handleShowInput(item)"></up-button>
- <up-button type="info"
- size="small"
- plain
- text="鍙傛暟璇︽儏"
- @click="handleShowParams(item)"></up-button>
<!-- <up-button type="error"
size="small"
plain
@@ -151,24 +146,6 @@
text="鏆傛棤鎶曞叆鏁版嵁" />
</view>
</up-modal>
- <!-- 鍙傛暟璇︽儏寮圭獥 -->
- <up-modal :show="paramsVisible"
- title="鍙傛暟璇︽儏"
- @confirm="paramsVisible = false">
- <view class="modal-content">
- <view v-if="currentParams.length > 0">
- <view v-for="(param, idx) in currentParams"
- :key="idx"
- class="detail-row">
- <text class="detail-label">{{ param.paramName }}</text>
- <text class="detail-value">{{ param.inputValue }} {{ param.unit && param.unit !== '/' ? '(' + param.unit + ')' : '' }}</text>
- </view>
- </view>
- <up-empty v-else
- mode="data"
- text="鏆傛棤鍙傛暟鏁版嵁" />
- </view>
- </up-modal>
</view>
</template>
@@ -201,9 +178,6 @@
const inputVisible = ref(false);
const inputList = ref([]);
- // 鍙傛暟璇︽儏鐩稿叧
- const paramsVisible = ref(false);
- const currentParams = ref([]);
const goBack = () => {
uni.navigateBack();
@@ -275,11 +249,6 @@
modal.closeLoading();
modal.msgError("鍔犺浇鎶曞叆鏁版嵁澶辫触");
});
- };
-
- const handleShowParams = item => {
- currentParams.value = item.productionOperationParamList || [];
- paramsVisible.value = true;
};
const handleDelete = item => {
diff --git a/src/pages/sales/salesAccount/goOut.vue b/src/pages/sales/salesAccount/goOut.vue
index 42321c9..e3c1c92 100644
--- a/src/pages/sales/salesAccount/goOut.vue
+++ b/src/pages/sales/salesAccount/goOut.vue
@@ -49,6 +49,11 @@
clearable />
</up-form-item>
</block>
+ <up-form-item label="鍙戣揣鍦板潃" prop="shippingAddress">
+ <up-input v-model="form.shippingAddress"
+ placeholder="璇疯緭鍏ュ彂璐у湴鍧�"
+ clearable />
+ </up-form-item>
</u-cell-group>
<!-- 鎵规閫夋嫨 -->
<u-cell-group title="鎵规閫夋嫨"
@@ -133,6 +138,7 @@
shippingCarNumber: "",
expressCompany: "",
expressNumber: "",
+ shippingAddress: "",
});
const rules = {
@@ -334,6 +340,7 @@
shippingCarNumber: form.type === "璐ц溅" ? form.shippingCarNumber : "",
expressCompany: form.type === "蹇��" ? form.expressCompany : "",
expressNumber: form.type === "蹇��" ? form.expressNumber : "",
+ shippingAddress: form.shippingAddress,
storageBlobDTOs: fileList.value
.filter(f => f.status === "success")
.map(f => f.storageBlobDTO),
diff --git a/src/pages/sales/salesAccount/out.vue b/src/pages/sales/salesAccount/out.vue
index bf33c8f..ae2a02a 100644
--- a/src/pages/sales/salesAccount/out.vue
+++ b/src/pages/sales/salesAccount/out.vue
@@ -90,6 +90,10 @@
<text class="detail-value">{{ item.shippingDate || '-' }}</text>
</view>
<view class="detail-row">
+ <text class="detail-label">鍙戣揣鍦板潃</text>
+ <text class="detail-value">{{ item.shippingAddress || '-' }}</text>
+ </view>
+ <view class="detail-row">
<text class="detail-label">鏁伴噺</text>
<text class="detail-value">{{ item.quantity }}</text>
</view>
diff --git a/src/pages/sales/salesQuotation/edit.vue b/src/pages/sales/salesQuotation/edit.vue
index bfcb930..66351b0 100644
--- a/src/pages/sales/salesQuotation/edit.vue
+++ b/src/pages/sales/salesQuotation/edit.vue
@@ -199,7 +199,7 @@
import { onLoad } from "@dcloudio/uni-app";
import FooterButtons from "@/components/FooterButtons.vue";
import PageHeader from "@/components/PageHeader.vue";
- import { formatDateToYMD } from "@/utils/ruoyi";
+ import { formatDateToYMD, parseTime } from "@/utils/ruoyi";
import { modelList, productTreeList } from "@/api/basicData/product";
import { userListNoPageByTenantId } from "@/api/system/user";
import {
@@ -549,6 +549,7 @@
const payload = {
...form.value,
+ ...(!quotationId.value ? { createTime: parseTime(new Date()) } : {}),
products: form.value.products.map(item => ({
productId: item.productId,
product: item.product,
--
Gitblit v1.9.3