diff --git a/pages/purchase/newAgr.vue b/pages/purchase/newAgr.vue
index 0137c21..4706f19 100644
--- a/pages/purchase/newAgr.vue
+++ b/pages/purchase/newAgr.vue
@@ -11,13 +11,14 @@
-
+
v.value);formData[k]=$event.value.slice(-1)[0].value"/>
@@ -34,7 +35,12 @@ export default {
goodsName:{label:"物品名称"},
massUnits:{label:"物品单位",type:"select",columns:[],value:[]},
goodsType:{label:"物品类型",type:"select",columns:[],value:[]},
- supplier:{label:"供应商"},
+ supplier:{label:"供应商",btnIcon:"plant-sousuo", btnFun:()=>{
+ uni.navigateTo({
+ url:`/pages/purchase/search?data=${this.formData.supplier}`,
+ events:{update:e=>this.formData.supplier=e||this.formData.supplier}
+ })
+ }},
detailedType:{label:"详情类型",type:"select",columns:[],value:[]},
remarks:{label:"备注",type:"textarea"},
},
diff --git a/pages/purchase/search.vue b/pages/purchase/search.vue
new file mode 100644
index 0000000..300bb43
--- /dev/null
+++ b/pages/purchase/search.vue
@@ -0,0 +1,61 @@
+
+
+
+
+
+ {{v}}
+
+
+
+
\ No newline at end of file
diff --git a/pages/stock/list.vue b/pages/stock/list.vue
index 4cf6ef5..c8fca21 100644
--- a/pages/stock/list.vue
+++ b/pages/stock/list.vue
@@ -220,8 +220,8 @@ export default{
fields:{
inOutType:{label:"库类型",type:"select",columns:[],value:[]},
inOutBatchNo:{label:"库批次号",btnText:"生成",btnFun:()=>this.formData.inOutBatchNo=`${({in:'RK',out:'CK'})[this.mode]}${new Date().format('yyyyMMdd')}${new Date().getTime()}`},
- pic:{label:"库凭证",type:"upImg",value:"",num:3},
number:{label:"库数量",placeholder:"请输入采购数量"},
+ pic:{label:"库凭证",type:"upImg",value:"",num:3},
},
formData:{
inOutType:"",
@@ -234,10 +234,6 @@ export default{
rules:{
inOutType:{required:true},
inOutBatchNo:{required:true},
- // pic:{required:true,validator(rule,val,call){
- // if(!this.fields.pic.value)call(new Error("请上传库凭证!"));
- // else call()
- // }},
number:{required:true,validator(rule,val,call){
if(!val)call(new Error(`请输入${({in:'入',out:'出'})[this.mode]}库数量!`));
else if(this.mode=='out' && val>this.detail.equivalentInventory)call(new Error(`${({in:'入',out:'出'})[this.mode]}库数量不能大于库存数量!`));
diff --git a/router/purchase.js b/router/purchase.js
index 70ba823..fec2976 100644
--- a/router/purchase.js
+++ b/router/purchase.js
@@ -74,4 +74,15 @@ module.exports=[
}
}
},
+ {
+ path:"pages/purchase/search",
+ style:{
+ navigationBarTitleText:"查询列表",
+ navigationBarBackgroundColor:"#10C176",
+ navigationBarTextStyle:"white",
+ "app-plus":{
+ titleNView:true
+ }
+ }
+ },
]
\ No newline at end of file
diff --git a/uni.scss b/uni.scss
index 7048b2f..a5aee7a 100644
--- a/uni.scss
+++ b/uni.scss
@@ -77,7 +77,7 @@ $uni-font-size-paragraph:15px;
@import '@/common/main.css';
@import 'uview-ui/theme.scss';
-@import url('https://at.alicdn.com/t/c/font_3852037_xnap1h9v4h.css');
+@import url('https://at.alicdn.com/t/c/font_3852037_uelrk7bjj2.css');
[class*=plant-]{
font-family: "plantMana" !important;
font-size: 16px;
diff --git a/uni_modules/d-form/components/d-form/d-form.vue b/uni_modules/d-form/components/d-form/d-form.vue
index 82fa985..f891432 100644
--- a/uni_modules/d-form/components/d-form/d-form.vue
+++ b/uni_modules/d-form/components/d-form/d-form.vue
@@ -214,7 +214,7 @@
{{suffix}}
-
+
{{value.length>0?Object.values(value[0]).join():"选择经纬度"}}
{{pickerContent}}
@@ -354,6 +354,10 @@ import {computeArea} from '@/common/utils'
type:String,
default:"",
},
+ btnIcon:{
+ type:String,
+ default:""
+ },
btnFun:{
type:Function,
default:()=>{}
diff --git a/uni_modules/d-picker/components/d-picker/d-picker.vue b/uni_modules/d-picker/components/d-picker/d-picker.vue
index e1ca91b..858c9fa 100644
--- a/uni_modules/d-picker/components/d-picker/d-picker.vue
+++ b/uni_modules/d-picker/components/d-picker/d-picker.vue
@@ -5,10 +5,39 @@
display:flex;
justify-content: space-between;
padding:10rpx;
+ align-items: center;
+ &>.search{
+ flex-grow: 1;
+ margin:6rpx 20rpx;
+ border:1rpx solid rgba(221, 221, 221, 0.5);
+ border-radius: 40rpx;
+ display:flex;
+ align-items: center;
+ input{
+ flex-grow: 1;
+ height:50rpx;
+ }
+ .plant-zengjia{
+ flex-shrink: 0;
+ color:#999;
+ transform: rotate(45deg);
+ }
+ }
+ &>button{
+ flex-shrink: 0;
+ }
}
picker-view{
height:500rpx;
+ &/deep/ .mask{
+ height:60rpx;
+ }
+ &/deep/ .item{
+ height:60rpx;
+ line-height: 60rpx;
+ text-align: center;
+ }
}
}
}
@@ -17,48 +46,65 @@
-
+
+
+
+
+
+
-
+
-
+
+ {{v}}
+