diff --git a/component/public/donghua.vue b/component/public/donghua.vue
index 5c76030..84974f3 100644
--- a/component/public/donghua.vue
+++ b/component/public/donghua.vue
@@ -21,11 +21,8 @@
)) -->
-
-
@@ -44,7 +41,6 @@
defaultImage: { type: String, default: '' },
interval: { type: Number, default: 80 }, // ms
playing: { type: Boolean, default: false },
- showButton: { type: Boolean, default: false },
loop: { type: Boolean, default: false },
// 可选：每帧最大重试次数（失败后跳过）
maxRetryPerFrame: { type: Number, default: 1 }
@@ -213,11 +209,6 @@
}
}, { immediate: false })
- /* ---------------- toggle via internal button ---------------- */
- function togglePlaying() {
- emit('update:playing', !props.playing)
- }
-
/* ---------------- cleanup ---------------- */
onUnmounted(() => {
clearTimer()
diff --git a/component/zy-upgrade/zy-upgrade.vue b/component/zy-upgrade/zy-upgrade.vue
index df27cab..641706c 100644
--- a/component/zy-upgrade/zy-upgrade.vue
+++ b/component/zy-upgrade/zy-upgrade.vue
@@ -1,10 +1,12 @@
-
-
+
+
-
+
@@ -19,22 +21,22 @@
{{update_tips}}
-
+
+ :style="'width: '+update_process+'%;'">
{{update_process}}%
-
+
-
+
- 确认升级
- 取消升级
+ 确认升级
+ 取消升级
@@ -48,19 +50,19 @@
export default {
name: 'ZyUpgrade',
props: {
- theme: { //主题，目前支持green,pink,blue,yellow,red
+ theme: { //主题，目前支持green,pink,blue,yellow,red
type: String,
default: 'green'
},
- updateurl: { //升级检测url，全路径
- type:String,
+ updateurl: { //升级检测url，全路径
+ type: String,
default: ''
},
- h5preview:{ //H5界面下是否预览升级
+ h5preview: { //H5界面下是否预览升级
type: Boolean,
default: false
},
- oldversion: { //如果是H5，为了方便测试，可以传入一个旧版本号进来。
+ oldversion: { //如果是H5，为了方便测试，可以传入一个旧版本号进来。
type: String,
default: ''
},
@@ -68,16 +70,16 @@
type: Number,
default: 0
},
- appstoreflag: { //是否启用appstore升级，如果启用，由服务端返回appstore的地址
+ appstoreflag: { //是否启用appstore升级，如果启用，由服务端返回appstore的地址
type: Boolean,
default: false
},
- noticeflag:{ //是否通知主界面无需更新
- type:Boolean,
+ noticeflag: { //是否通知主界面无需更新
+ type: Boolean,
default: false
},
- autocheckupdate:{ //是否页面截入时就判断升级
- type:Boolean,
+ autocheckupdate: { //是否页面截入时就判断升级
+ type: Boolean,
default: true
}
},
@@ -96,131 +98,134 @@
vesioncode: this.oldcode,
wgt_flag: 0,
wgt_url: '',
- size: 0 ,//开启gzip等情形下，获取不到安装包大小，可以服务端返回安装包大小
- header:{Authorization:uni.getStorageSync('token')||"token"}
+ size: 0, //开启gzip等情形下，获取不到安装包大小，可以服务端返回安装包大小
+ header: {
+ Authorization: uni.getStorageSync('token') || "token"
+ }
}
},
-
+
mounted() {
let app_flag = false
// #ifdef APP-PLUS
app_flag = true
// #endif
- if((this.h5preview || app_flag) && this.autocheckupdate){
+ if ((this.h5preview || app_flag) && this.autocheckupdate) {
this.check_update()
}
},
- computed:{
- version(){
+ computed: {
+ version() {
let retversion = ''
- retversion = this.currentversion + (this.currentversion!=''&&this.updated2version!=''?' -> ':'')+this.updated2version
+ retversion = this.currentversion + (this.currentversion != '' && this.updated2version != '' ? ' -> ' :
+ '') + this.updated2version
return retversion
}
},
- methods:{
+ methods: {
//检测升级
- check_update(){
+ check_update() {
let that = this
// #ifdef APP-PLUS
- plus.runtime.getProperty(plus.runtime.appid, function(widgetInfo) {
+ plus.runtime.getProperty(plus.runtime.appid, function(widgetInfo) {
that.currentversion = widgetInfo.version
that.versionname = widgetInfo.name
that.versioncode = widgetInfo.versionCode
that.updatebusiness(that)
- });
+ });
// #endif
// #ifdef H5
- if(this.h5preview){
+ if (this.h5preview) {
this.updatebusiness(that)
}
// #endif
},
- updatebusiness: function(that){ //具体升级的业务逻辑 https://www.focusnu.com/opeapi
+ updatebusiness: function(that) { //具体升级的业务逻辑 https://www.focusnu.com/opeapi
uni.request({
url: `https://www.focusnu.com/devopsapi/api/pad/versionUpdate?platform=1&version=${that.currentversion}`,
method: 'GET',
- dataType:'json',
+ dataType: 'json',
success: (res) => {
// console.log("?????",`https://www.focusnu.com/devopsapi/api/pad/versionUpdate?platform=1&version=${that.currentversion}`)
// this.$emit('chuandinew',this.updated2version)
- if(res.statusCode===404){
- return
+ if (res.statusCode === 404) {
+ return
}
- if(res.data.code==100){
- //提示升级
- console.log(res.data.data,111111111)
- if(res.data.data.wgt_flag=='2'){
+ if (res.data.code == 100) {
+ //提示升级
+ // console.log(res.data.data,111111111)
+ if (res.data.data.wgt_flag == '2') {
that.wgt_flag = res.data.data.wgt_flag;
- that.updated2version = res.data.data.version;
+ that.updated2version = res.data.data.version;
that.update_tips = res.data.data.update_tips;
- that.forceupgrade = res.data.data.forceupdate==1;
+ that.forceupgrade = res.data.data.forceupdate == 1;
that.version_url = res.data.data.update_url;
that.updated2version = res.data.data.version;
that.wgt_flag = res.data.data.wgt_flag;
that.wgt_url = res.data.data.wgt_url;
that.size = res.data.data.size;
that.dshow = true;
-
- }else if(res.data.data.update_url){
+
+ } else if (res.data.data.update_url) {
that.dshow = true;
-
+
that.update_tips = res.data.data.update_tips;
- that.forceupgrade = res.data.data.forceupdate==1;
+ that.forceupgrade = res.data.data.forceupdate == 1;
that.version_url = res.data.data.update_url;
that.updated2version = res.data.data.version;
that.wgt_flag = res.data.data.wgt_flag;
that.wgt_url = res.data.data.wgt_url;
that.size = res.data.data.size;
that.getnewbanben();
- }else{
- if(that.noticeflag){
+ } else {
+ if (that.noticeflag) {
//通知父组件，当前版为最新版本
- that.$emit("showupdateTips",0)
+ that.$emit("showupdateTips", 0)
}
}
- }else{
+ } else {
uni.showToast({
- title: '请求升级出错：'+ data.msg,
- icon:'none'
+ title: '请求升级出错：' + data.msg,
+ icon: 'none'
});
- }
+ }
},
fail() {
this.loading = false;
}
});
},
- getnewbanben:function(){
- this.$emit('chuandinew',this.updated2version)
+ getnewbanben: function() {
+ this.$emit('chuandinew', this.updated2version)
},
//点击开始升级按钮，开始升级
- upgrade_checked:function(){
- if(this.wgt_flag==2){
+ upgrade_checked: function() {
+ if (this.wgt_flag == 2) {
this.dshow = false
this.updateversion()
- }else{
+ } else {
uni.removeStorageSync('token')
this.update_flag = true
this.updateversion()
}
-
+
},
//点击取消升级按钮，取消升级
- upgrade_cancel:function(){
+ upgrade_cancel: function() {
this.dshow = false
},
//升级过程中，点击中断升级按钮，中断升级
- upgrade_break: function(){
+ upgrade_break: function() {
this.downloadTask.abort()
this.update_flag = false
},
//升级下载apk安装包的具体处理业务逻辑
- updateversion: function(){
+ updateversion: function() {
//console.log("检查升级方法")
let platform = uni.getSystemInfoSync().platform
let that = this
//console.log("操作系统：",platform)
- if(that.wgt_flag==2){
+ if (that.wgt_flag == 2) {
try {
const Intent = plus.android.importClass('android.content.Intent')
const Uri = plus.android.importClass('android.net.Uri')
@@ -234,66 +239,65 @@
// 小米商店不存在 or 被禁用
console.log('打开小米应用商店失败', e)
}
-
+
return
}
- if(platform == 'ios' && this.appstoreflag && that.wgt_flag!=1){
+ if (platform == 'ios' && this.appstoreflag && that.wgt_flag != 1) {
//如果启用ios appstore升级，则打开appstore
that.dshow = false
//console.log("跳转至appstore")
plus.runtime.launchApplication({
- action: that.version_url
+ action: that.version_url
}, function(e) {
- uni.showToast({
- title: '打开appstore失败',
- icon:'none'
- });
+ uni.showToast({
+ title: '打开appstore失败',
+ icon: 'none'
+ });
});
- }else{
-
+ } else {
+
let that = this
- let downloadurl = that.wgt_flag==1?that.wgt_url:that.version_url;
+ let downloadurl = that.wgt_flag == 1 ? that.wgt_url : that.version_url;
let targetUrl = "https://www.focusnu.com/devopsapi/sys/common/static/" + downloadurl
- this.update_confirm = true
+ this.update_confirm = true
this.downloadTask = uni.downloadFile({
- url: targetUrl,
- header:this.header,
- success:function(res){
- console.log("!!!",res)
- if(res.statusCode == 200){
+ url: targetUrl,
+ header: this.header,
+ success: function(res) {
+ console.log("!!!", res)
+ if (res.statusCode == 200) {
//开始安装
plus.runtime.install(res.tempFilePath, {
- force: false
- }, function() {
+ force: false
+ }, function() {
plus.runtime.restart();
- }, function(e) {
+ }, function(e) {
uni.showToast({
title: '升级失败',
- icon:'none'
+ icon: 'none'
});
- });
- }else{
+ });
+ } else {
uni.showToast({
title: '下载失败，网络错误',
- icon:'none'
+ icon: 'none'
});
}
},
- fail:function(e) {
+ fail: function(e) {
uni.showToast({
- title: '下载失败:'+e.errMsg,
- icon:'none'
+ title: '下载失败:' + e.errMsg,
+ icon: 'none'
});
this.update_flag = false
},
- complete:function(){
- }
+ complete: function() {}
})
- this.downloadTask.onProgressUpdate(function(res){
+ this.downloadTask.onProgressUpdate(function(res) {
that.update_process = res.progress
- if(res.progress == Infinity){
- let progress = (res.totalBytesWritten / that.size)*100
- if(progress>100){
+ if (res.progress == Infinity) {
+ let progress = (res.totalBytesWritten / that.size) * 100
+ if (progress > 100) {
progress = 100
}
that.update_process = progress
@@ -307,57 +311,66 @@
+ }
+
+ ::v-deep ::-webkit-scrollbar-thumb {
+ /* 滚动条里面小方块 */
+ border-radius: 5rpx !important;
+ box-shadow: inset 0 0 1rpx rgba(0, 0, 0, 0.2) !important;
+ background-color: #CCCCCC !important;
+ }
+
\ No newline at end of file
diff --git a/pages/login/newanimationpage.vue b/pages/login/newanimationpage.vue
index ccdd96c..3a58f70 100644
--- a/pages/login/newanimationpage.vue
+++ b/pages/login/newanimationpage.vue
@@ -1,14 +1,14 @@
-
+
-
+
-
+
库房
@@ -42,7 +42,7 @@
-
+
服务大厅
@@ -72,11 +72,11 @@
{{ fontnumber }}
-
+
-
+
@@ -85,10 +85,10 @@
-
+
-
+
-
+
-
+
-
+
@@ -135,7 +135,7 @@
return true; // 禁止返回手势返回
})
- const ceshiopen = ref(false);
+ // const ceshiopen = ref(false);
const playall = ref(false);
const zyupgrade = ref(null);
@@ -158,7 +158,7 @@
onShow(() => {
setTimeout(() => {
playall.value = true;
- }, 500)
+ }, 1300)
zyupgrade.value?.check_update();
queryPadPageList().then((res => {
@@ -265,9 +265,6 @@
1, // 起始索引为 1
false // 不补零
)
-
-
-
onMounted(() => {
// 矩阵的菜单大量数据
getServiceTree0('1,2,3,4,5').then((res : any) => {
@@ -276,16 +273,12 @@
uni.setStorageSync("saveTree3", res.result.fwzl[3])
uni.setStorageSync("saveTree4", res.result.fwzl[4])
uni.setStorageSync("saveTree5", res.result.fwzl[5])
- //缓存护嘱菜单
})
-
-
})
const housedex = ref(0);
const navurl = ref('')
const housactive = (index : number) => {
-
housedex.value = index;
if (index == 0) {
let data = filteredMenu('izHldy')[0]
@@ -306,17 +299,8 @@
})
}
if (index == 1) {
- // uni.navigateTo({
- // url: '/pages/recording/recorder'
- // })
- }
- // if (index == 2) {
- // navurl.value = 'pages/Warehouse/picking'
- // uni.navigateTo({
- // url: '/' + navurl.value
- // })
- // }
+ }
if (index === 3) {
uni.navigateTo({
@@ -337,13 +321,9 @@
uni.setStorageSync('nuName', data.nuName);
uni.setStorageSync('elderId', data.elderInfo ? data.elderInfo?.id : null);
uni.setStorageSync('NUall', data);
- // uni.navigateTo({
- // url: '/pages/Warehouse/index/index',
- // })
uni.navigateTo({
url: '/pages/NursingNew/index?kf=1',
})
-
}
if (index == 6) {
uni.navigateTo({
@@ -369,28 +349,6 @@
})
}
- const ceshijump = () => {
- // ceshiopen.value = true
- // uni.navigateTo({
- // url:"/pages/login/ceshi"
- // })
- console.log("wtf")
- // try {
- // const Intent = plus.android.importClass('android.content.Intent')
- // const Uri = plus.android.importClass('android.net.Uri')
- // const main = plus.android.runtimeMainActivity()
-
- // const intent = new Intent(Intent.ACTION_VIEW)
- // intent.setData(Uri.parse('mimarket://details?id=com.android.hldy'))
- // // 强制使用小米应用商店
- // intent.setPackage('com.xiaomi.market')
-
- // main.startActivity(intent)
- // } catch (e) {
- // // 小米商店不存在 or 被禁用
- // console.log('打开小米应用商店失败', e)
- // }
- }
\ No newline at end of file
diff --git a/pages/material/api/api.js b/pages/material/api/api.js
new file mode 100644
index 0000000..c95f720
--- /dev/null
+++ b/pages/material/api/api.js
@@ -0,0 +1,42 @@
+// 引入 request 文件
+import request from '@/request/index.js'
+
+// 查询物料列表
+export const getCkWlList = (params) => {
+ return request({
+ url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/getCkWlList?nuId=${uni.getStorageSync('nuId')}`,
+ method: 'get',
+ data: params,
+ })
+}
+// 盘点接口
+export const savePddInfo = (params) => {
+ return request({
+ url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/savePddInfo`,
+ method: 'post',
+ data: params,
+ })
+}
+
+// 查询物料的进度
+export const getPdjd = () => {
+ return request({
+ url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/getPdjd?nuId=${uni.getStorageSync('nuId')}`,
+ method: 'get',
+ })
+}
+// 查询物料信息列表
+export const queryCrkInfoList = (param) => {
+ return request({
+ url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/queryCrkInfoList?nuId=${uni.getStorageSync('nuId')}&column=createTime&order=desc&pageNo=${param.pageNo}&pageSize=15&wlId=${param.wlId}&cgdId=${param.cgdId}`,
+ method: 'get',
+ })
+}
+// 改价接口
+export const editXsjg = (params) => {
+ return request({
+ url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/editXsjg`,
+ method: 'post',
+ data: params,
+ })
+}
\ No newline at end of file
diff --git a/pages/material/component/calculator.vue b/pages/material/component/calculator.vue
new file mode 100644
index 0000000..3ac7252
--- /dev/null
+++ b/pages/material/component/calculator.vue
@@ -0,0 +1,328 @@
+
+
+
+
+ 修改价格
+
+
+
+
+
+ {{ item }}
+
+
+
+
+
+ 销售价格
+
+
+
+
+
+ {{ item }}
+
+
+
+
+
+ 取消
+ 确认
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/material/component/carditem.vue b/pages/material/component/carditem.vue
index 08e0b7d..49c7655 100644
--- a/pages/material/component/carditem.vue
+++ b/pages/material/component/carditem.vue
@@ -1,21 +1,20 @@
-
+
-
-
+
- 采购单号：C10120251012001 ↑↓
+ 采购单号：{{ v.ddNo }} ↑↓
- 325
+ {{ Number(v.kcsl || 0).toFixed(2) }}
库存数量
@@ -26,49 +25,53 @@
- 复健用品
- 复健用品
+ {{ v.categoryId_dictText }}
+ {{ v.typeId_dictText }}
-
- 纸尿裤-拉拉裤纸尿裤拉拉裤纸尿裤
+ {{ v.materialName }}
- 物料编码: ZHYP044
+ 物料编码: {{ v.materialNo }}
- 规格型号: 800mm*680mm
+ 规格型号: {{ v.specificationModel }}
- 品牌型号：品牌型号名称
+ 品牌型号：{{ v.brandType }}
- 生产厂家：吉林省捌零信创科技有限...
+ 生产厂家：{{ v.manufacturer }}
- 供 应 商 ：长春市天林商贸有限公司...
+ 供 应 商 ：{{ v.gysName }}
-
-
- 盘点
+
+ 盘点
出入库
-
+
销售价格
-
+
+
+ 已盘点
+
+
+ 盘盈
+
+
+ 盘亏
+
+
+ 无销售价格
+
@@ -78,10 +81,10 @@
-
-
+
+
-
+
@@ -104,39 +107,45 @@
const priceshow = ref(false)
const pd = ref(false)
const pds = ref(false)
- const emit = defineEmits(['addcartory', 'scrolltolower', 'addcar', 'crk'])
+ const emit = defineEmits(['scrolltolower', 'crk', `finishit`])
const serverUrl = ref('')
onMounted(() => {
serverUrl.value = uni.getStorageSync('serverUrl') + '/sys/common/static/';
})
- const pandian = ()=>{
+
+ const cardvalue = ref({})
+
+ const pandian = (item) => {
+ cardvalue.value = item;
pds.value = true
- setTimeout(()=>{
+ setTimeout(() => {
pd.value = true
- },10)
+ }, 10)
}
- const guanbipd = ()=>{
+ const guanbipd = () => {
pd.value = false;
- setTimeout(()=>{
+ setTimeout(() => {
pds.value = false
- },450)
-
+ }, 450)
+
}
- const caigouobj = ref({})
+ // const caigouobj = ref({})
const addcar = (v : any, i : number) => {
+ console.log("看看值",v)
+ cardvalue.value = v;
priceshow.value = true
// console.log("为啥点击不上啊",i)
- if (Number(v.kcsl) >= Number(v.upperLimit)) {
- uni.showToast({
- title: '库存数量已满，不可添加购物车！',
- icon: 'none'
- })
- return
- }
- caigouobj.value = v;
- caigouobj.value.index = i;
- caigouobj.value.yj = false;
- emit('addcartory', caigouobj.value)
+ // if (Number(v.kcsl) >= Number(v.upperLimit)) {
+ // uni.showToast({
+ // title: '库存数量已满，不可添加购物车！',
+ // icon: 'none'
+ // })
+ // return
+ // }
+ // caigouobj.value = v;
+ // caigouobj.value.index = i;
+ // caigouobj.value.yj = false;
+ // emit('addcartory', caigouobj.value)
}
// const pageX = ref(0);
// const pageY = ref(0);
@@ -209,10 +218,17 @@
openwhitchindex.value = -1
}
}
+
+ const finishit = () => {
+ pds.value = false;
+ pd.value = false;
+ openwhitchindex.value = -1
+ emit('finishit')
+ }
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/pages/material/component/crkitem.vue b/pages/material/component/crkitem.vue
index 3bef614..3e67e0c 100644
--- a/pages/material/component/crkitem.vue
+++ b/pages/material/component/crkitem.vue
@@ -1,6 +1,6 @@
-
@@ -12,11 +12,11 @@
- 采购单号：C10120251012001
+ 采购单号：{{ v.ddNo }}
- 325
+ {{ Number(v.kcsl || 0).toFixed(2) }}
库存数量
@@ -27,8 +27,8 @@
- 复健用品
- 复健用品
+ {{ v.categoryId_dictText }}
+ {{ v.typeId_dictText }}
-
+
+
\ No newline at end of file
diff --git a/pages/material/component/gress.vue b/pages/material/component/gress.vue
index 89a5652..b3079c8 100644
--- a/pages/material/component/gress.vue
+++ b/pages/material/component/gress.vue
@@ -1,169 +1,161 @@
-
-
-
-
+
+
+
-
+ }">
+
-
-
- {{ Math.round(animateProgress) }}%
- 进度
-
-
+
+
+ {{ Math.round(animateProgress) }}%
+ 进度
+
+
\ No newline at end of file
diff --git a/pages/material/component/information.vue b/pages/material/component/information.vue
index ca0bdb9..76f653a 100644
--- a/pages/material/component/information.vue
+++ b/pages/material/component/information.vue
@@ -1,465 +1,539 @@
-
+
物料信息
-
+
-
-
- 325
- 库存数量
+
+
+ {{ Number(pushcrkitem.kcsl || 0).toFixed(2) }}
+ 库存数量
+
+
+
+
+
-
-
-
-
-
-
- 复健用品
- 复健用品
-
-
-
-
- 纸尿裤-拉拉裤纸尿裤拉拉裤纸尿裤
-
-
- 物料编码: ZHYP044
-
-
- 规格型号: 800mm*680mm
-
-
- 品牌型号：品牌型号名称
-
-
- 生产厂家：吉林省捌零信创科技有限...
-
-
- 供 应 商 ：长春市天林商贸有限公司...
-
+
+ {{ pushcrkitem.categoryId_dictText }}
+ {{ pushcrkitem.typeId_dictText }}
+
+
+
+
+ {{ pushcrkitem.materialName }}
+
+
+ 物料编码: {{ pushcrkitem.materialName }}
+
+
+ 规格型号: {{ pushcrkitem.specificationModel }}
+
+
+ 品牌型号：{{ pushcrkitem.brandType }}
+
+
+ 生产厂家：{{ pushcrkitem.manufacturer }}
+
+
+ 供 应 商 ：{{ pushcrkitem.gysName }}
-
-
-
-
- 采购单号：C10120251012001
- 15+5 销
-
-
- 采 购 人 ： 李彩霞
-
-
-
- 采购时间： 2026.03.27 10:35:26
- 盘亏
-
-
- 采购单号：C10120251012001
- + 5 - 5
+
+
+
+ 采购单号：{{ item.ddNo }}
+ {{ item.crkNum }} +{{ item.gzsl }} -{{ item.xzsl }} {{ item.materialUnits }}
+
+
+ 采 购 人 ： {{ item.cgBy }}
+
+
+
+ 采购时间： {{ item.createTime }}
+ 盘盈
+ 盘亏
+
-
- 采 购 人 ： 李彩霞
-
-
-
- 采购时间： 2026.03.27 10:35:26
- 盘盈
-
-
+
+
+ .scroll-view{
+ width: 100%;
+ height: 40vw;
+
+ }
+
\ No newline at end of file
diff --git a/pages/material/component/inventory.vue b/pages/material/component/inventory.vue
index 8a4f7bf..30d9b42 100644
--- a/pages/material/component/inventory.vue
+++ b/pages/material/component/inventory.vue
@@ -1,75 +1,78 @@
-
+
-
+
- 325
+ {{ ((Number( pandiannumber|| 0) - Number(cardvalue.kcsl || 0)).toFixed(2)) }}
差额
- 25
+ {{ Number(cardvalue.kcsl).toFixed(2) }}
库存数量
- --
+ {{ Number(pandiannumber).toFixed(2) }}
盘点数量
- 复健用品
- 复健用品
+ {{ cardvalue.categoryId_dictText }}
+ {{ cardvalue.typeId_dictText }}
- 纸尿裤-拉拉裤纸尿裤拉拉裤纸尿裤 ZHYP044
+ {{ cardvalue.materialName }}{{ cardvalue.materialNo }}
- 规格型号: 800mm*680mm
+ 规格型号: {{ cardvalue.specificationModel }}
- 品牌型号：品牌型号名称
+ 品牌型号：{{ cardvalue.brandType }}
- 生产厂家：吉林省捌零信创科技有限...
+ 生产厂家：{{ cardvalue.manufacturer }}
- 供 应 商 ：长春市天林商贸有限公司...
+ 供 应 商 ：{{ cardvalue.gysName }}
-
-
+
+
-
-
+
+
备注
- 1
+ 1
-
+
拍照
- 2
+ {{ saveimagearray.length }}
-
+
+ 同步
+
+
确定
@@ -82,47 +85,45 @@
-
+
- {{pddType=='1'?'取消':'关闭'}}
- 确定
+ {{pddType=='1'?'取消':'关闭'}}
+ 确定
拍照：
-
+
-
-
+
+
-
+
点击拍照上传
-
+
-
+
- {{pddType=='1'?'取消':'关闭'}}
- 确定
+ {{pddType=='1'?'取消':'关闭'}}
+ 确定
-
+
-
+
@@ -131,276 +132,315 @@
import { ref, onMounted, reactive, onBeforeUnmount, computed, nextTick, defineComponent, inject, watch } from 'vue';
import { onShow, onLoad, onHide, onPageScroll } from "@dcloudio/uni-app"
import torytor from './torytor.vue'
+ import { savePddInfo } from '../api/api.js'
+
+
const transition = ref(false)
const bz = ref(false)
const pz = ref(false)
const pddType = ref('1')
+
+ const props = defineProps({
+ isShow: {
+ type: Boolean
+ },
+ cardvalue: {
+ type: Object
+ }
+ });
+ watch(
+ () => props.isShow,
+ (newVal, oldVal) => {
+ if (!oldVal && newVal) {
+ transition.value = false;
+ setTimeout(() => {
+ transition.value = true;
+ }, 10)
+ } else {
+ transition.value = false;
+ }
+ }
+ )
+ const open = ref(0)
+ const scrolltop = ref(0)
+ const serverUrl = ref(uni.getStorageSync('serverUrl') + '/sys/common/static/')
+ const emit = defineEmits(['finishit'])
+ const valitem = ref({});
+ const valindex = ref(-1);
+
+ const havezk = ref(false)
+ // 点击锁
+ const secondlock = ref(false)
+ // 检测上一次点击
+ const savelastvalue = ref(false)
+
+ // const zhankai = (v, i) => {
+
+ // let s = Math.ceil((i + 1) / 3);
+ // if (valindex.value != i && valindex.value > -1 && uni.getStorageSync('valitem') && props.pddType == '1') {
+ // emit('tabitem', valindex.value, uni.getStorageSync('valitem'))
+ // }
+ // valindex.value = i;
+ // scrolltop.value = top.value;
+ // v.zk = !v.zk;
+ // savelastvalue.value = v.zk
+ // if (savelastvalue.value && v.zk) {
+ // secondlock.value = true;
+ // }
+ // havezk.value = v.zk
+
+ // if (v.zk) {
+ // if (props.pddType == '1') { uni.setStorageSync('valitem', v); }
+ // setTimeout(() => {
+ // v.yczk = v.zk;
+ // }, 200)
+ // } else {
+ // v.yczk = v.zk;
+ // v.bz = false;
+ // v.pz = false;
+ // }
+ // gb(i)
+ // }
+ // const gb = (i) => {
+ // props.pddlist.forEach((item, k) => {
+ // if (i != k) {
+ // item.zk = false;
+ // item.bz = false;
+ // item.pz = false;
+ // item.yczk = false;
+ // }
+ // })
+ // }
+ const top = ref(0)
+ const scroll = (e) => {
+ top.value = e.detail.scrollTop;
+ }
- const props = defineProps({
- isShow: {
- type: Boolean
- },
- });
- watch(
- () => props.isShow,
- (newVal, oldVal) => {
- if (!oldVal && newVal) {
- transition.value = false;
- setTimeout(() => {
- transition.value = true;
- }, 10)
- } else {
- transition.value = false;
- }
- }
- )
- const open = ref(0)
- const scrolltop = ref(0)
- const serverUrl = ref(uni.getStorageSync('serverUrl') + '/sys/common/static/')
- const emit = defineEmits(['scrolltolower', 'tabitem', 'right'])
- const valitem = ref({});
- const valindex = ref(-1);
-
- const havezk = ref(false)
- // 点击锁
- const secondlock = ref(false)
- // 检测上一次点击
- const savelastvalue = ref(false)
-
- const zhankai = (v, i) => {
-
- let s = Math.ceil((i + 1) / 3);
- if (valindex.value != i && valindex.value > -1 && uni.getStorageSync('valitem') && props.pddType == '1') {
- emit('tabitem', valindex.value, uni.getStorageSync('valitem'))
- }
- valindex.value = i;
- scrolltop.value = top.value;
- v.zk = !v.zk;
- savelastvalue.value = v.zk
- if(savelastvalue.value && v.zk){
- secondlock.value = true;
- }
- havezk.value = v.zk
-
- if (v.zk) {
- if (props.pddType == '1') { uni.setStorageSync('valitem', v); }
- setTimeout(() => {
- v.yczk = v.zk;
- }, 200)
- } else {
- v.yczk = v.zk;
- v.bz = false;
- v.pz = false;
- }
- // if (v.dczk == true) {
-
- // } else {
- // // nextTick(() => {
- // // // scrolltop.value = (top.value > (s - 2) * 182) ? top.value : (s - 2) * 182;
- // // // scrolltop.value = (Math.ceil(i / 2) -1) * 200;
- // // })
- // }
-
- gb(i)
- }
- const gb = (i) => {
- props.pddlist.forEach((item, k) => {
- if (i != k) {
- item.zk = false;
- item.bz = false;
- item.pz = false;
- item.yczk = false;
- }
- })
- }
- const top = ref(0)
- const scroll = (e) => {
- // console.log(e.detail.scrollTop)
- top.value = e.detail.scrollTop;
- }
- const pddjjnum = (e, i) => {
- let ce = 0;
- props.pddlist[i].pdsl = e;
- ce = e - props.pddlist[i].dqkcsl;
- props.pddlist[i].cesl = Math.abs(ce);
- props.pddlist[i].pdType = ce == 0 ? '' : (ce > 0 ? 1 : 2)
- }
- const config = (e, i) => {
- // console.log("点击成功了吗?")
- if ((e.content == '' || e.content == null) && e.cesl != 0) {
- uni.showToast({
- icon: 'error',
- title: "请填写备注！"
- })
- return
- }
- emit('right', e, i)
- }
- const scrolltolower = () => {
- emit('scrolltolower')
- }
- // 上传
- const albumlist = ref([])
- const uplod = (v, i) => {
- uni.chooseImage({
- count: 1, //默认9
- sizeType: ['compressed'], //可以指定是原图还是压缩图，默认二者都有
- sourceType: ['camera'], //从相册选择
- success: (e) => {
- let ar = JSON.stringify(e.tempFilePaths)
- uni.compressImage({
- src: JSON.parse(ar)[0],
- quality: 60,
- success: res => {
- sxdupld(res.tempFilePath, v)
- // v.picPatharr.push(res.tempFilePath);
- // console.log(v.picPatharr)
- }
- })
- }
- });
- }
- const sxdupld = (e, v) => {
- let now = new Date();
- let year = now.getFullYear();
- let month = now.getMonth() + 1;
- uni.uploadFile({
- url: uni.getStorageSync('serverUrl') + '/sys/common/upload',
- filePath: e,
- name: 'file',
- formData: {
- biz: year + '/' + month + '/pddPic'
- },
- header: {
- 'X-Access-Token': uni.getStorageSync('token')
- },
- success: res => {
- const data = JSON.parse(res.data);
- console.log(v)
- v.picPatharr.push(data.message);
- shuzhi(v)
- },
- fail: () => {
- uni.showToast({ title: '上传失败', icon: 'none' })
- }
- })
- }
- const previewImage = (arr, p, i) => {
- let u = []
- arr.picPatharr.forEach(e => {
- u.push(serverUrl.value + e)
- })
- uni.previewImage({
- current: i,
- urls: u,
- showmenu: false,
- longPressActions: {
- itemList: [],
- }
- })
- }
- const shuzhi = (v) => {
- v.picPath = '';
- v.picPatharr.forEach((e, i) => {
- v.picPath += e + ','
- })
- }
- const picv = ref({});
- const pici = ref(0);
- const del = (v, o) => {
- picv.value = v;
- pici.value = o;
- }
- const del1 = () => {
- picv.value.picPatharr.splice(pici.value, 1);
- open.value = 0
- }
- /** 只针对 UniApp 原生 App 的最简判断函数（true = 上半，false = 下半，null = 无法判断） */
- function isTopHalfApp(e) {
- if (!e) return null;
- // 原生 app 常见：changedTouches 或 touches
- const touch = (e.changedTouches && e.changedTouches[0]) || (e.touches && e.touches[0]) || null;
- const y = touch
- ? (typeof touch.clientY === 'number' ? touch.clientY : (typeof touch.pageY === 'number' ? touch.pageY : null))
- : (e.detail && typeof e.detail.y === 'number' ? e.detail.y : null);
-
- let h = null;
- try {
- h = uni.getSystemInfoSync().windowHeight; // UniApp 原生 App 推荐使用
- } catch (err) {
- h = null;
- }
-
- if (y == null || !h) return null;
- return y <= (h * 1 / 2);
- }
- const isbottom = ref(false);
- const clicklock = ref(false)
- /** 事件处理示例 */
- function onTap(e) {
- const top = isTopHalfApp(e);
- if (top === null) {
- // uni.showToast({ title: '无法判断坐标', icon: 'none' });
- return;
- }
- if (havezk.value) {
- // console.log("top", top, clicklock.value)
- if (!clicklock.value || secondlock.value ) {
- if (!top) {
- isbottom.value = true
- // console.log("开启了")
- } else {
- isbottom.value = false
- }
- clicklock.value = true;
- secondlock.value = false;
- }
- // if (!top) {
- // isbottom.value = true
- // // console.log("开启了")
- // } else {
- // isbottom.value = false
- // }
- } else {
- clicklock.value = false
- }
-
- // uni.showToast({ title: top ? '上半部分' : '下半部分', icon: 'none' });
- }
+ const inputValue = ref({
+ pandiannumber:0,
+
+ })
+
+ const pandiannumber = ref(0)
+ const pddjjnum = (e:number) => {
+ // let ce = 0;
+ // props.pddlist[i].pdsl = e;
+ // ce = e - props.pddlist[i].dqkcsl;
+ // props.pddlist[i].cesl = Math.abs(ce);
+ // props.pddlist[i].pdType = ce == 0 ? '' : (ce > 0 ? 1 : 2);
+ // console.log("aaaa",e)
+ pandiannumber.value = e
+ }
+
+ const config = () => {
+ // console.log("点击成功了吗?")
+ if ( (Number(props.cardvalue.kcsl || 0) - Number(pandiannumber.value || 0)) && (relcontent.value == '' || relcontent.value == null)) {
+ uni.showToast({
+ icon: 'error',
+ title: "请填写备注！"
+ })
+ return
+ }
+ const diff = Number((Number(pandiannumber.value || 0) - Number(props.cardvalue.kcsl || 0)).toFixed(2))
+
+ let inputValue = {
+ nuId:uni.getStorageSync('nuId'),
+ id:props.cardvalue.id,
+ ckId:props.cardvalue.id,
+ pdsl:pandiannumber.value,
+ pdType: diff > 0 ? 1 : diff < 0 ? 2 : 0,
+ cesl:diff,
+ content:relcontent.value,
+ picPath:saveimagearray.value.toString()
+ }
+
+ // console.log("看看入参",inputValue)
+ savePddInfo(inputValue).then((res:any)=>{
+ // console.log("看看有啥吧",res.success)
+ if(res.success){
+ emit('finishit')
+ }
+ })
+ // let inputValue = {
+ // // cardvalue:""
+ // }
+ // savePddInfo()
+ // emit('right', e, i)
+ }
+ // const scrolltolower = () => {
+ // emit('scrolltolower')
+ // }
+ // 上传
+ const albumlist = ref([])
+ const uplod = () => {
+ uni.chooseImage({
+ count: 1, //默认9
+ sizeType: ['compressed'], //可以指定是原图还是压缩图，默认二者都有
+ sourceType: ['camera'], //从相册选择
+ success: (e) => {
+ let ar = JSON.stringify(e.tempFilePaths)
+ uni.compressImage({
+ src: JSON.parse(ar)[0],
+ quality: 60,
+ success: res => {
+ sxdupld(res.tempFilePath)
+ }
+ })
+ }
+ });
+ }
+ const sxdupld = (e) => {
+ let now = new Date();
+ let year = now.getFullYear();
+ let month = now.getMonth() + 1;
+ uni.uploadFile({
+ url: uni.getStorageSync('serverUrl') + '/sys/common/upload',
+ filePath: e,
+ name: 'file',
+ formData: {
+ biz: year + '/' + month + '/pddPic'
+ },
+ header: {
+ 'X-Access-Token': uni.getStorageSync('token')
+ },
+ success: res => {
+ const data = JSON.parse(res.data);
+ // console.log("data",data)
+ saveimagearray.value.push(data.message)
+ // console.log(`111111111111`,saveimagearray.value)
+ // v.picPatharr.push(data.message);
+ // shuzhi(v)
+ },
+ fail: () => {
+ uni.showToast({ title: '上传失败', icon: 'none' })
+ }
+ })
+ }
+
+ const saveimagearray = ref([])
+
+ const previewImage = (arr, p, i) => {
+ let u = []
+ arr.picPatharr.forEach(e => {
+ u.push(serverUrl.value + e)
+ })
+ uni.previewImage({
+ current: i,
+ urls: u,
+ showmenu: false,
+ longPressActions: {
+ itemList: [],
+ }
+ })
+ }
+ // const shuzhi = (v) => {
+ // v.picPath = '';
+ // v.picPatharr.forEach((e, i) => {
+ // v.picPath += e + ','
+ // })
+ // }
+ const picv = ref({});
+ const pici = ref(0);
+ const del = (index:number) => {
+ saveimagearray.value.splice(index,1)
+ }
+ // const del1 = () => {
+ // picv.value.picPatharr.splice(pici.value, 1);
+ // open.value = 0
+ // }
+ /** 只针对 UniApp 原生 App 的最简判断函数（true = 上半，false = 下半，null = 无法判断） */
+ function isTopHalfApp(e) {
+ if (!e) return null;
+ // 原生 app 常见：changedTouches 或 touches
+ const touch = (e.changedTouches && e.changedTouches[0]) || (e.touches && e.touches[0]) || null;
+ const y = touch
+ ? (typeof touch.clientY === 'number' ? touch.clientY : (typeof touch.pageY === 'number' ? touch.pageY : null))
+ : (e.detail && typeof e.detail.y === 'number' ? e.detail.y : null);
+
+ let h = null;
+ try {
+ h = uni.getSystemInfoSync().windowHeight; // UniApp 原生 App 推荐使用
+ } catch (err) {
+ h = null;
+ }
+
+ if (y == null || !h) return null;
+ return y <= (h * 1 / 2);
+ }
+ const isbottom = ref(false);
+ const clicklock = ref(false)
+ /** 事件处理示例 */
+ function onTap(e) {
+ const top = isTopHalfApp(e);
+ if (top === null) {
+ // uni.showToast({ title: '无法判断坐标', icon: 'none' });
+ return;
+ }
+ if (havezk.value) {
+ // console.log("top", top, clicklock.value)
+ if (!clicklock.value || secondlock.value) {
+ if (!top) {
+ isbottom.value = true
+ // console.log("开启了")
+ } else {
+ isbottom.value = false
+ }
+ clicklock.value = true;
+ secondlock.value = false;
+ }
+ } else {
+ clicklock.value = false
+ }
+ }
+ const pushnumber = ref(0);
+ const content = ref("");
+ const relcontent = ref("")
+
+ const samecopy = () => {
+ pushnumber.value = -13.33;
+ nextTick(()=>{
+ pushnumber.value = Number(props.cardvalue.kcsl)
+ })
+ }
+
+
\ No newline at end of file
diff --git a/pages/material/component/price.vue b/pages/material/component/price.vue
index eed5e86..2e745ff 100644
--- a/pages/material/component/price.vue
+++ b/pages/material/component/price.vue
@@ -1,32 +1,33 @@
-
+
销售价格
- 供应商：长春市天林商贸有限公司
+ 供应商：{{ cardvalue.gysName }}
- 采购单号 101C20251012001
- 库存数量105
+ 采购单号 {{ cardvalue.ddNo }}
+ 库存数量{{ Number(cardvalue.kcsl ).toFixed(2) }}
+
随行单
-
-
+
+
- 复健用品
- 复健用品
+ {{ cardvalue.categoryId_dictText }}
+ {{ cardvalue.typeId_dictText }}
+
+ ↑
+ ￥{{ (cardvalue.arrivalPrice - cardvalue.procurementPrice).toFixed(2) }}
+ ↓
+ ￥{{ (cardvalue.procurementPrice - cardvalue.arrivalPrice).toFixed(2) }}
-
+
- ￥0.35
-
+ ￥{{ changethenvalue==-998? Number(cardvalue.xsjg).toFixed(2):Number(changethenvalue).toFixed(2) }}
+
-
+
销售价格
- ↓￥0.26
+
- 片
+ {{ cardvalue.wlunits }}
采购单位
- 片
-
+ {{ cardvalue.xsdw }}
+
- 采购单位
+ 销售单位
取消
- 确认
+ 确认
+
+
+
+
+
+
+
+
+
+
+ .cal-view {
+ position: absolute;
+ bottom: 70rpx;
+ left: 400rpx;
+ width: 800rpx;
+ height: 1000rpx;
+ transition: bottom 0.3s ease;
+ z-index: 2;
+ }
+
\ No newline at end of file
diff --git a/pages/material/component/torytor.vue b/pages/material/component/torytor.vue
index a4b1487..400a228 100644
--- a/pages/material/component/torytor.vue
+++ b/pages/material/component/torytor.vue
@@ -1,37 +1,36 @@
-
+
- 数量
-
-
+ 盘点数量
+
+
+ {{item}}
+
+
+
+
-
-
-
- {{item}}
-
-
-
+
+
-
-
+
-
+
-
- 同步
-
-
{{item}}
@@ -43,11 +42,8 @@
\ No newline at end of file
diff --git a/pages/material/material.vue b/pages/material/material.vue
index 6c2a017..3b59006 100644
--- a/pages/material/material.vue
+++ b/pages/material/material.vue
@@ -1,9 +1,10 @@
-
+
-
-
+
@@ -11,11 +12,11 @@
检索
-
重置
-
+ -->
出入库
@@ -27,14 +28,17 @@
暂无物料
-
+
+
+
-
+
+
-
+
@@ -45,71 +49,122 @@
import gress from './component/gress.vue'
import crkval from './component/crkval.vue'
import information from './component/information.vue'
+ import { getCkWlList, getPdjd } from './api/api.js'
+
+
const percent = ref(0);
- const crkit = ref(false)
- const transition = ref(false)
- const crkshow = ref(false)
-
- const props = defineProps({
- isShow: {
- type: Boolean
- },
- });
- watch(
- () => props.isShow,
- (newVal, oldVal) => {
- if (!oldVal && newVal) {
- transition.value = false;
- setTimeout(()=>{
- percent.value = 55
- },1000)
- setTimeout(() => {
- transition.value = true;
- }, 50)
- } else {
- transition.value = false;
- }
- console.log(transition.value)
- }
- )
- const form = reactive({
- nuId: uni.getStorageSync('nuId'),
- pageNo: 1,
- pageSize: 30,
- categoryId: '',
- typeId: '',
- medicationId: '',
- wlParamInfo: '',
- isWaring: 0,
- suppliers: ''
- })
- const ification = ref(false)
- const InvoicingList = ref([{},{},{},{},{},{},]);
- const search = (x : number) => {
- if (x === 0) { form.wlParamInfo = '' }
- form.pageNo = 1;
- InvoicingList.value = [];
- // queryInvo();
- }
- const crk = ()=>{
- crkit.value = true
- }
- const chongzhi = () => {
- form.categoryId = '';
- form.typeId = '';
- form.medicationId = '';
- form.suppliers = '';
- form.pageNo = 1;
- form.wlParamInfo = '',
- InvoicingList.value = [];
- // classication.value.typescroll(1, -1, {});
- // classication.value.qingkong();
- // classication.value.config();
- }
+ const crkit = ref(false)
+ const transition = ref(false)
+ const crkshow = ref(false)
+
+ const props = defineProps({
+ isShow: {
+ type: Boolean,
+ default: false
+ },
+ });
+ watch(
+ () => props.isShow,
+ (newVal, oldVal) => {
+ if (!oldVal && newVal) {
+ transition.value = false;
+ setTimeout(() => {
+ transition.value = true;
+ }, 50)
+ } else {
+ transition.value = false;
+ }
+ }
+ )
+ // const form = reactive({
+ // nuId: uni.getStorageSync('nuId'),
+ // pageNo: 1,
+ // pageSize: 30,
+ // categoryId: '',
+ // typeId: '',
+ // medicationId: '',
+ // wlParamInfo: '',
+ // isWaring: 0,
+ // suppliers: ''
+ // })
+ const ification = ref(false)
+ const InvoicingList = ref([]);
+ const search = (x : number) => {
+ if (x === 0) { inputValue.value.wlParamInfo = '' }
+ getCardArray()
+ }
+ const pushcrkitem = ref({})
+ const crk = (item:any) => {
+ // console.log("咋没了啊",item)
+ pushcrkitem.value = item
+ crkit.value = true
+ }
+ // const chongzhi = () => {
+ // // form.categoryId = '';
+ // // form.typeId = '';
+ // // form.medicationId = '';
+ // // form.suppliers = '';
+ // // form.pageNo = 1;
+ // // form.wlParamInfo = '',
+ // // InvoicingList.value = [];
+ // getCardArray()
+ // // classication.value.typescroll(1, -1, {});
+ // // classication.value.qingkong();
+ // // classication.value.config();
+ // }
+ // 输入框
+ const inputwhat = ref("")
+ // 入参
+ const inputValue = ref({
+ pageNo: 1,
+ pageSize: 16,
+ nuId: uni.getStorageSync('nuId'),
+ wlParamInfo: ""
+ })
+ // 初始化卡片
+ const getCardArray = () => {
+ inputValue.value.pageNo = 1;
+ addlock.value = false
+ getCkWlList(inputValue.value).then((res : any) => {
+ console.log("看看卡片列表",res.result.records)
+ InvoicingList.value = res.result.records
+ if (res.result.records.length != 16) {
+ addlock.value = true
+ }
+ })
+ }
+ // 添加锁，节流
+ const addlock = ref(false)
+ // 添加卡片
+ const scrolltolower = () => {
+ if (!addlock.value) {
+ inputValue.value.pageNo++
+ getCkWlList(inputValue).then((res : any) => {
+ InvoicingList.value.push(...res.result.records)
+ if (res.result.records.length != 16) {
+ addlock.value = true
+ }
+ })
+ }
+ }
+
+ // 刷新页面
+ const finishit = () => {
+ getCardArray();
+ getPdjd().then((res : any) => {
+ const total = Number(res.result.totalNum || 0)
+ const pd = Number(res.result.pdNum || 0)
+ percent.value = total === 0 ? 0 : Math.round((pd / total) * 100)
+ // console.log("对不对啊", res.result)
+ })
+ }
+ onLoad(() => {
+ finishit()
+ })
+
\ No newline at end of file