Merge remote-tracking branch 'origin/master'

zhangherong

3 天以前 f4b97641a18b333e7b8417ebbe6db0c87e538eb5

 src/views/qms/SamplingRulesList.vue

@@ -98,7 +98,7 @@
              <a-icon type="down" />
            </a>
            <a-menu slot="overlay">
              <a-menu-item>
              <a-menu-item v-if="record.ruleStatus==1">
                <a @click="handleEdit(record)">编辑</a>
              </a-menu-item>
              <a-menu-item>