Merge branch 'product' of git.mes123.com:zhouyx/mes-ui into product

pages/materiel/classification/add.vue

@@ -194,45 +194,45 @@ export default {
       ],
       checkList: [
         {
-          field: "drawing",
-          title: "图号",
+          field: "name",
+          title: "名称",
           note: "",
           dataType: 0,
           unitName: "",
-          required: false,
+          required: true,
           isunique: false,
-          fieldType: 1,
+          fieldType: 1, //共有属性(不能删除)
           categoryId: 0,
           action: 1,
           add: 0, //新增标识
         },
         {
-          field: "version",
-          title: "版本",
+          field: "drawing",
+          title: "图号",
           note: "",
           dataType: 0,
           unitName: "",
-          required: true,
+          required: false,
           isunique: false,
           fieldType: 1,
           categoryId: 0,
           action: 1,
           add: 0, //新增标识
         },
-
         {
-          field: "name",
-          title: "名称",
+          field: "version",
+          title: "版本",
           note: "",
           dataType: 0,
           unitName: "",
           required: true,
           isunique: false,
-          fieldType: 1, //共有属性(不能删除)
+          fieldType: 1,
           categoryId: 0,
           action: 1,
           add: 0, //新增标识
         },
+
         {
           field: "description",
           title: "描述",

pages/qc/certificate/endIssued/detail.vue

@@ -10,7 +10,7 @@
           <div class="certificate-label">{{item.productSerialNumber}}</div>
           <Row style="margin-top:8px;">
             <Col :span="16">
-              <div v-if="item.status==3?false:true">
+              <div v-if="item.status!=3">
                 <Checkbox
                   v-model="index"
                   @change.native="changeBox(index,item.id)"
@@ -199,6 +199,7 @@ export default {
   <style lang="less" scoped>
 .cer-detail {
   margin: 0 20px;
+  min-height: 160px;
   .cer-list {
     height: 100px;
     width: 225px;

pages/store/edit.vue

@@ -58,7 +58,7 @@ export default {
       rules: {
         name: [{ required: true, message: "必填", trigger: "blur" }],
         materialType: [
-          { required: true, message: "必填", trigger: "blur", type: "array" },
+          { required: true, message: "必填", trigger: "blur", },
         ],
       },
     };