merge

src/views/modules/order/dispatch.vue

@@ -118,7 +118,7 @@
           width="120"
           label="操作">
           <template slot-scope="scope">
-            <el-button v-if="isAuth('order:deliver:info')" type="text" size="small" @click="detailHandle(scope.row.deliverId)">查看</el-button>
+            <el-button v-if="isAuth('order:deliver:info')" type="text" size="small" @click="detailHandle(scope.row.productId)">查看</el-button>
             <el-button v-if="isAuth('order:deliver:send') && Number(scope.row.state) === 2" type="text" size="small" @click="sendHandle(scope.row.deliverId)">发货</el-button>
             <el-button v-if="isAuth('order:deliver:arrive') && Number(scope.row.state) === 3" type="text" size="small" @click="arriveHandle(scope.row.deliverId)">送达</el-button>
           </template>

src/views/modules/sale/add-material.vue

@@ -35,10 +35,10 @@
           <el-input type="textarea" v-model="dataForm.notes" :disabled="display" placeholder="备注"></el-input>
         </el-form-item>
       </el-form>
-      <span slot="footer" class="dialog-footer">
-      <el-button @click="visible = false">取消</el-button>
-      <el-button v-if="!display" type="primary" @click="dataFormSubmit()">确定</el-button>
-    </span>
+      <span slot="footer">
+        <el-button @click="visible = false">取消</el-button>
+        <el-button v-if="!display" type="primary" @click="dataFormSubmit()">确定</el-button>
+      </span>
     </el-dialog>
   </div>
 </template>