Merge branch 'product-kk' into product

pages/dncmnc/dnc/index.vue

 <template>
   <div class="dnc_box">
-    <!-- 数据传输 -->
-    <DataGrid :columns="columns" ref="grid" :action="action" :data="data" :high="false"></DataGrid>
+    <!-- 数据传输:action="action" 接口数据 -->
+    <DataGrid :columns="columns" ref="grid" :data="data" :high="false">
+      <template slot="easySearch">
+        <Form ref="formInline" :model="easySearch" inline>
+          <FormItem prop="keys">
+            <Input placeholder="请输入关键字班次名称" v-model="easySearch.keys.value" />
+          </FormItem>
+          <FormItem>
+            <Button type="primary" @click="search">查询</Button>
+          </FormItem>
+        </Form>
+      </template>
+      <template slot="buttons">
+        <Button type="primary" >新增</Button>
+      </template>
+    </DataGrid>
+    <Modal v-model="editModal" title="编辑" footer-hide width="800">
+      <!-- <Edit :row="rowData" @on-close="cancel" @on-option-ok="addOk" /> -->
+    </Modal>
   </div>
 </template>
 <script>
@@ -9,6 +26,10 @@ export default {
   components: {},
   data() {
     return {
+      editModal: false,
+      easySearch: {
+        keys: { op: 'projectNo', value: null }
+      },
       columns: [
         {
           key: "projectNo",
@@ -91,7 +112,7 @@ export default {
           notse: "适用于MDF设备"
         },
         {
-          projectNo: "1102347890",
+          projectNo: "12366588",
           id:2,
           lingNo: "dd4.rt5.991",
           lingName: "轴承",
@@ -105,7 +126,7 @@ export default {
           notse: "适用于MDF设备"
         },
         {
-          projectNo: "1102347890",
+          projectNo: "2536898",
           id:3,
           lingNo: "dd4.rt5.991",
           lingName: "轴承",
@@ -119,7 +140,7 @@ export default {
           notse: "适用于MDF设备"
         },
         {
-          projectNo: "1102347890",
+          projectNo: "35653248",
           id:4,
           lingNo: "dd4.rt5.991",
           lingName: "轴承",
@@ -137,12 +158,16 @@ export default {
   },
   created() {},
   mounted() {
-    this.loadDuration();
+    // this.loadDuration();
   },
   methods: {
-      edit(rowData){
-          console.log(rowData)
-      },
+    search() {
+        this.$Message.success("搜索查询")
+      // this.$refs.grid.reload(this.easySearch)
+    },
+    edit(rowData){
+        console.log(rowData)
+    },
   },
   computed: {},
   watch: {}

pages/dncmnc/mnc/analysis.vue

+<template>
+    <div>
+        数据分析表
+    </div>
+</template>
+<script>
+export default {
+    
+}
+</script>

pages/handle/examine7/detail.vue

@@ -25,7 +25,7 @@
       <Filed :span="12" name="问题原因">{{entity.reason}}</Filed>
       <Filed :span="12" name="责任归属">{{entity.personLiableId}}</Filed>
       <Filed :span="24" name="不合格产品">{{entity.productIds}}</Filed>
-      <Filed :span="24" name="审理单号">{{entity.code}}</Filed>
+      <!-- <Filed :span="24" name="审理单号">{{entity.code}}</Filed> -->
     </Row>
   </div>
 </template>