~jhz/STUWMS.git

			@@ -94,6 +94,13 @@
			HStockOrgID: {
			type: [String, Number],
			},
			HMaterID:
			{
			type: [String, Number],
			},
			HBillType:{
			type: [String, Number],
			},
			},
			mounted() {},
			methods: {
			@@ -134,14 +141,20 @@
			},
			getsWhere() {
			let sWhere =
			` and 禁用标记 !='Y' and ISNULL(审核人,'')!='' and HUSEORGID = '${ uni.getStorageSync("OrganizationID")}'`
			` and a.HStopFlag =0 and ISNULL(a.HCheckEmp,'')!='' and a.HUSEORGID = '${ uni.getStorageSync("OrganizationID")}'`
			// ` and 禁用标记 !='Y' and ISNULL(审核人,'')!='' and a.HUSEORGID = '${ uni.getStorageSync("OrganizationID")}'`


			if (this.HCode) {
			swhere += ` and 不良原因代码 like '%${this.HCode}%'`
			// swhere += ` and 不良原因代码 like '%${this.HCode}%'`
			swhere += ` and a.HNumber like '%${this.HCode}%'`
			}
			if (this.HName) {
			swhere += ` and 不良原因名称 like '%${this.HName}%'`
			// swhere += ` and 不良原因名称 like '%${this.HName}%'`
			swhere += ` and a.HName like '%${this.HName}%'`
			}

			console.log("sWhere",sWhere)
			return sWhere
			},
			getBillList() {
			@@ -150,9 +163,12 @@
			this.page = 0
			this.curPage = 1
			CommonUtils.doRequest(
			"/Gy_BadReason/list", {
			"/Gy_BadReason/list_1", {
			sWhere: this.getsWhere(),
			user: getUserInfo()['Czymc']
			user: getUserInfo()['Czymc'],
			HMaterID:this.HMaterID,
			HBillType:this.HBillType,
			OrgID:uni.getStorageSync("OrganizationID")
			},
			(res) => {
			let {

			@@ -529,7 +529,7 @@
			<BillListPopupVue ref="billList" :HBillType="hform.HBillType" :HSourceBillType="hform.HSourceBillType"
			:HStockOrgID="hform.HStockOrgID" @BillSelectComplete="HandleBillSelectComplete"></BillListPopupVue>
			<BadReasonPopupVue v-if="enablePopupModule == PopupModuleNameList[9]" ref="listPopup"
			@update="HBadReasonComplete"></BadReasonPopupVue>
			@update="HBadReasonComplete" :HMaterID="hform.HMaterID" HBillType="3703" ></BadReasonPopupVue>
			</view>
			</template>

	components/ZLGL/BadReasonPopup.vue	26 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/ZLGL/lailiaojianyan/POStockInCheckBill.vue	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史