Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/views/statisticalReport/stockPurchaseReceiptReportList.vue

@@ -358,8 +358,11 @@
         </div>
       </el-form>
       <div slot="footer" class="dialog-footer">
+        <span v-if="roleFlag == 1 ">
         <el-button @click="dialogFormVisible11 = false">取 消</el-button>
         <el-button type="primary" @click="remarksSubmit()">保存</el-button>
+        </span>
+        <span v-else><el-button @click="dialogFormVisible11 = false">关 闭</el-button></span>
       </div>
     </el-dialog>
     <!--定金-->