优化

src/view/performance/12-orderAccounting/componets/hjfpfb.vue

@@ -45,7 +45,7 @@
               </el-button>
             </el-form-item>
 			
-<<<<<<< HEAD
+
 			<el-form-item label="印件名称">
 			  <el-input
 			    v-model="form.jjcp_yjno"
@@ -179,7 +179,7 @@ const handleExcel = () => {
 const handleSearch = async() => {
 
   const order = form.value['gdbh']
-<<<<<<< HEAD
+
   const jjcp_yjno = props.jjcp_yjno;
   const res = await getWasteDistribution({ order,jjcp_yjno })
 =======