前端

extension.js

@@ -0,0 +1,17 @@
+var hx = require("hbuilderx");
+//该方法将在插件激活的时候调用
+function activate(context) {
+	let disposable = hx.commands.registerCommand('extension.helloWorld', () => {
+		hx.window.showInformationMessage('你好，这是我的第一个插件扩展。');
+	});
+	//订阅销毁钩子，插件禁用的时候，自动注销该command。
+	context.subscriptions.push(disposable);
+}
+//该方法将在插件禁用的时候调用（目前是在插件卸载的时候触发）
+function deactivate() {
+
+}
+module.exports = {
+	activate,
+	deactivate
+}

pages/erpbusiness/add_quality_testing.vue

@@ -468,7 +468,7 @@
 					grossWeight: 0,
 					tare: 0,
 					grade:'',
-					inOutDate: new Date().toISOString().slice(0, 10),
+					// inOutDate: new Date().toISOString().slice(0, 10),
 					netWeight:0,
 					pureWeight:0,
 					deductionWeight:0,
@@ -491,7 +491,7 @@
 					boxNoOther:'',
 					titleNo:'',
 					titleNoOther:'',
-					statusFlag:0
+					statusFlag:1
 				},
 				typeList: ['潮粮', '干粮'],
 				managementType: '',
@@ -829,7 +829,10 @@
 					
 					if(this.gridList.contractNo==this.contractNolist[i].contractNo){
 						if(this.typevalue==3){
-							if(this.goodsList.indexOf(this.contractNolist[i].goodsName)!=-1){
+							var gooddata=this.goodsList.filter((item)=>{
+								return item.goodsName==this.contractNolist[i].goodsName
+							})
+							if(gooddata.length>0){
 								// 收购入库
 								for (let q = 0; q < this.goodsList.length; q++) {
 									if(this.goodsList[q].goodsName==this.contractNolist[i].goodsName){
@@ -1098,7 +1101,7 @@
 					return
 				}
 				if(this.utils.getCurrectRoles('acquisitionQuality.initial')){
-					this.gridList.statusFlag=0
+					
 					// if (!this.gridList.qualityNo) {
 					// 	this.$api.msg('编号不能为空')
 					// 	return
@@ -1162,9 +1165,6 @@
 					}
 				}
 				if(this.utils.getCurrectRoles('acquisitionQuality.qview')){
-					if(!this.utils.getCurrectRoles('acquisitionQuality.initial')){
-						this.gridList.statusFlag=7
-					}
 					if(this.typevalue==3){
 						if (!this.gridList.customerName) {
 							this.$api.msg('客户不能为空')
@@ -1251,6 +1251,13 @@
 															'/warehouseInOutInfo/InOutWarehouse',
 															that.gridList)
 														.then(res => {
+															if(that.utils.getCurrectRoles('acquisitionQuality.qview')){
+																if(!that.utils.getCurrectRoles('acquisitionQuality.initial')){
+																	that.gridList.statusFlag=7
+																}else{
+																	that.gridList.statusFlag=0
+																}
+															}
 															that.gridList.warehouseInOutId=res.data.data
 													that.$api.doRequest('post',
 															'/qualityInspectionManagement/api/addQualityInspection',
@@ -1284,6 +1291,7 @@
 										'/warehouseInOutInfo/InOutWarehouse',
 										that.gridList)
 									.then(res => {
+										
 										that.gridList.warehouseInOutId=res.data.data
 										that.$api.doRequest('post',
 												'/qualityInspectionManagement/api/addQualityInspection',
@@ -1321,7 +1329,7 @@
 				this.waterContentChange()
 			},
 			setGoodName(e,status) {
-				console.log(this.goodsList[e[0]].goodsName,111111111)
+				// console.log(this.goodsList[e[0]].goodsName,111111111)
 				// 
 				// [e[0]] = 0
 				// this.$set(this.gradeList,'grade',this.gradeList[e[0]].value)

pages/leave/the_leave_record.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<d-rili></d-rili>
+
 		<view class='wrap' v-for="(item, index) in tableData" :key="index">
 			<view class="wenzi audit1" v-if="item.approveStatus == '待人事审核' || item.approveStatus == '待主管审核' ">审核中</view>
 			<view class="wenzi audit2" v-if="item.status == '已通过'">已通过</view>