【修改】bug【修改】bug

src/views/supply/apply/components/engin_form.vue

@@ -61,11 +61,7 @@
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">
           <el-form-item label="工程登录类型" prop="loginType">
-<<<<<<< Updated upstream
-            <el-input v-model="mainForm.loginType" placeholder="请输入工程登录类型" disabled></el-input>
-=======
             <el-input v-model="mainForm.loginType" placeholder="请输入工程登录类型" :disabled="isDealer"></el-input>
->>>>>>> Stashed changes
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">

src/views/supply/deliver/sum_list.vue

@@ -140,13 +140,10 @@
             </el-table-column>
                <el-table-column align="left" label="订单号" prop="orderId" min-width="130" show-overflow-tooltip>
               <template slot-scope="scope">
-<<<<<<< Updated upstream
+
                 <CopyButton :copyText="scope.row.enginOrderType =='HOME' || scope.row.enginOrderType =='TRADE'? scope.row.enginOrderNo :scope.row.mainOrderId " />
                 <span>{{scope.row.enginOrderType =='HOME' || scope.row.enginOrderType =='TRADE'? scope.row.enginOrderNo :scope.row.mainOrderId }}</span>
-=======
-                <CopyButton :copyText="scope.row.enginOrderType =='HOME' || scope.row.enginOrderType =='TRADE'? scope.row.enginOrderNo :scope.row.mainOrderId" />
-                <span>{{scope.row.enginOrderType =='HOME' || scope.row.enginOrderType =='TRADE'? scope.row.enginOrderNo :scope.row.mainOrderId}}</span>
->>>>>>> Stashed changes
+
               </template>
             </el-table-column>
             <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="100" show-overflow-tooltip>