lilei před 8 měsíci
rodič
revize
94a6788184
3 změnil soubory, kde provedl 24 přidání a 5 odebrání
  1. 9 2
      components/select/v-select.vue
  2. 2 2
      manifest.json
  3. 13 1
      pages/sales/salesSearch.vue

+ 9 - 2
components/select/v-select.vue

@@ -1,7 +1,7 @@
 <template>
 	<picker @change="toChange" :value="index" :range="datalist" range-key="dispName">
 		<view style="display: flex;align-items: center;">
-			<u-input class="form-input" type="select" style="width: 100%;" :input-align="inputAlign" v-model="selected" :placeholder="getPlaceholderText" />
+			<u-input class="form-input" type="select" style="width: 100%;" :clearable="clearable" @clear="clearInput" :input-align="inputAlign" v-model="selected" :placeholder="getPlaceholderText" />
 		</view>
 	</picker>
 </template>
@@ -33,6 +33,10 @@ export default {
       type: String,
       required: true
     },
+	clearable:{
+		type: [Boolean, String],
+		default: false
+	},
     placeholder: {
       type: String,
       default: ''
@@ -116,7 +120,10 @@ export default {
 		this.index = e.target.value
 		this.selected = this.datalist[this.index].dispName
         this.$emit('itemChange', this.datalist[this.index].code)
-    }
+    },
+	clearInput(){
+		this.$emit('clear','')
+	}
   }
 
 }

+ 2 - 2
manifest.json

@@ -2,8 +2,8 @@
     "name" : "iSCM智慧供应链",
     "appid" : "__UNI__5B57B68",
     "description" : "iSCM智慧供应链系统",
-    "versionName" : "1.4.5",
-    "versionCode" : 145,
+    "versionName" : "1.4.6",
+    "versionCode" : 146,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

+ 13 - 1
pages/sales/salesSearch.vue

@@ -20,6 +20,12 @@
 				<u-form-item label="单据来源" prop="settleStyleSn" class="form-item">
 					<u-input clearable v-model="sourceTypeName" @click="sourceTypeModal=true" placeholder="请选择单据来源" type="select" @clear="clearSourceType" />
 				</u-form-item>
+				<!-- <u-form-item label="是否铺货" prop="settleStyleSn" class="form-item">
+					<v-select placeholder="请选择是否铺货" clearable @itemChange="e=>form.distributionFlag==e" @clear="form.distributionFlag==''" code="FLAG" style="width: 100%"></v-select>
+				</u-form-item>
+				<u-form-item label="客户关系" prop="settleStyleSn" class="form-item">
+					<v-select placeholder="请选择客户关系" clearable @itemChange="e=>form.buyerRelationType==e" @clear="form.buyerRelationType==''" code="CUSTOMER_RELATION_TYPE" style="width: 100%"></v-select>
+				</u-form-item> -->
 			</u-form>
 			<view class="uni-list-btns">
 				<u-button class="handle-btn" size="medium" shape="circle" hover-class="none" @click="resetForm">重置</u-button>
@@ -64,7 +70,9 @@
 					buyerNameCurrent: '', //  客户名称
 					salesBillNo: '', //  销售单号
 					purchaseBillNo: '', //  采购单号
-					settleStyleSn: undefined //  收款方式
+					settleStyleSn: undefined ,//  收款方式
+					distributionFlag: undefined, // 是否铺货
+					buyerRelationType: undefined, // 客户关系
 				},
 				customBtnStyle: {  //  自定义按钮样式
 					borderColor: this.$config('primaryColor'),
@@ -102,6 +110,8 @@
 				this.form.purchaseBillNo = this.defaultParams.purchaseBillNo ? this.defaultParams.purchaseBillNo : ''
 				this.form.settleStyleSn = this.defaultParams.settleStyleSn ? this.defaultParams.settleStyleSn : ''
 				this.form.sourceType = this.defaultParams.sourceType ? this.defaultParams.sourceType : ''
+				this.form.distributionFlag= this.defaultParams.distributionFlag ? this.defaultParams.distributionFlag  : undefined // 是否铺货
+				this.form.buyerRelationType= this.defaultParams.buyerRelationType ? this.defaultParams.buyerRelationType : undefined // 客户关系
 			},
 			// 查询
 			handleSearch() {
@@ -124,6 +134,8 @@
 				this.form.beginDate = ''
 				this.form.endDate = ''
 				this.$refs.uForm.resetFields()
+				this.form.distributionFlag= undefined // 是否铺货
+				this.form.buyerRelationType= undefined // 客户关系
 				this.clearSettleStyle()
 				this.clearSourceType()
 				this.$emit('refresh', null)