ERP_override.git

			@@ -31,6 +31,7 @@
			let dialogTransferVisible = ref(false)
			let uploadPictureVisible = ref(false)
			let alienEditorVisible = ref(false)
			let fileUploadVisible = ref(false)
			const transferData = ref({
			oldOrderId:null,
			newOrderNumber:null,
			@@ -50,6 +51,8 @@
			{label:t('order.universalShape'),value:'1'}, {label:t('order.alien'),value:'2'}
			])
			const newOrderId = ref([])

			const orderTypeState = ref(0)

			// 定义表头上传数据
			const titleUploadData = ref({
			@@ -815,7 +818,11 @@
			return
			}
			rowIndex=row
			alienEditorVisible.value= true
			if(orderTypeState.value===1){
			fileUploadVisible.value=true
			}else{
			alienEditorVisible.value=true
			}
			}

			}
			@@ -896,6 +903,7 @@
			titleUploadData.value['verifierId'] = null
			titleUploadData.value['verifier'] = null


			const orderDetails = res.data.orderDetails
			orderDetails.forEach(item => {
			item.otherColumns = JSON.parse(item.otherColumns)
			@@ -931,6 +939,11 @@
			if(res.data.order.processReview === 2 && res.data.order.orderReview === 0){
			gridOptions.toolbarConfig.buttons[2].disabled = false
			//gridOptions.menuConfig.body.options[0][8].disabled =false
			}

			//下单后工艺审核之前可以右键上传dwg文件
			if(res.data.order.createOrder === 2 && res.data.order.processReview === 0){
			orderTypeState.value=1
			}

			//按钮审核过后变为反审
			@@ -1950,7 +1963,7 @@
			style="width: 100%;height: 100%" />
			</el-dialog>
			<!--异形导入-->
			<!-- <el-dialog v-model="alienEditorVisible"
			<el-dialog v-model="alienEditorVisible"
			:title="$t('')"
			:close-on-click-modal="false"
			:close-on-press-escape="false"
			@@ -1961,7 +1974,7 @@
			:rowIndex="rowIndex"
			@getUploadPicture="getUploadPicture"
			style="width: 100%;height: 100%" />
			</el-dialog>-->
			</el-dialog>

			<!-- 尺寸审核窗口-->
			<el-dialog
			@@ -1998,7 +2011,7 @@
			</el-dialog>

			<el-dialog id="loadDWG"
			v-model="alienEditorVisible"
			v-model="fileUploadVisible"
			:close-on-click-modal="false"
			destroy-on-close width="800px">
			<upload-picture

	north-glass-erp/northglass-erp/src/views/mm/productStock/StorageRecord.vue	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue	21 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -145,7 +145,7 @@
			const selectOrderList = ()=>{
			request.post(`/finishedGoodsInventory/getSelectStorageRecord/${pageNum.value}/${total.pageSize}/${selectDate.value}/${type.value}`,filterData.value).then((res) => {
			if(res.code==200){


			selectDate.value = res.data.selectDate
			if (res.data.total!=null){
			total.dataTotal = res.data.total.total*1