Merge branch 'master' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-qms

src/components/common/seekPage.vue

@@ -47,6 +47,15 @@
               >
               </el-date-picker>
             </div>
+            <div v-if="item.type == 'DictSelection'">
+              <DictSelection
+                v-model="defaultWhere[item.value]"
+                :placeholder="item.placeholder || '请选择内容'"
+                :multiple="item.multiple ? item.multiple : false"
+                :style="{ width: item.width ? item.width + 'px' : '220px' }"
+                :dictName="item.dictName"
+              />
+            </div>
           </div>
         </el-form-item>
       </el-form-item>
@@ -125,6 +134,17 @@
                         >
                         </el-date-picker>
                       </div>
+                      <div v-if="item.type == 'DictSelection'">
+                        <DictSelection
+                          v-model="defaultWhere[item.value]"
+                          :placeholder="item.placeholder || '请选择内容'"
+                          :multiple="item.multiple ? item.multiple : false"
+                          :style="{
+                            width: item.width ? item.width + 'px' : '220px'
+                          }"
+                          :dictName="item.dictName"
+                        />
+                      </div>
                     </el-form-item>
                   </el-form-item>
                 </el-form>

src/views/inspectionClassify/components/user-list.vue

@@ -11,6 +11,7 @@
       tool-class="ele-toolbar-form"
       cache-key="inspectionClassify"
       row-key="id"
+      :page-size="20"
     >
       <!-- 表头工具栏 -->
       <template v-slot:toolbar>
@@ -208,6 +209,12 @@
             align: 'center',
             minWidth: 120
           },
+          {
+            prop: 'standardCode',
+            label: '标准代码',
+            align: 'center',
+            minWidth: 110
+          },
 
           {
             label: '状态',

src/views/inspectionClassify/components/user-search.vue

@@ -1,85 +1,65 @@
 <!-- 搜索表单 -->
 <template>
-  <el-form label-width="80px" class="ele-form-search" @keyup.enter.native="search" @submit.native.prevent>
-    <el-row :gutter="24">
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="参数名称:">
-          <el-input clearable v-model="where.inspectionName" placeholder="请输入" />
-        </el-form-item>
-      </el-col>
-
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="状态:">
-          <el-select clearable v-model="where.status" placeholder="请选择状态">
-            <el-option v-for="item in statusList" :key="item.value" :label="item.label" :value="item.value">
-            </el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <!-- <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="组织机构:">
-          <auth-selection
-            data-type="Array"
-            v-model="where.deptIds"
-            style="width: 100%"
-          ></auth-selection>
-        </el-form-item>
-      </el-col> -->
-
-      <el-col v-bind="styleResponsive ? { lg: 12, md: 12 } : { span: 6 }" style="text-align: right">
-        <el-form-item label-width="50px">
-          <el-button type="primary" icon="el-icon-search" class="ele-btn-icon" @click="search" size="small">
-            查询
-          </el-button>
-          <el-button @click="reset" icon="el-icon-refresh-left" size="small">重置</el-button>
-        </el-form-item>
-      </el-col>
-    </el-row>
-  </el-form>
+  <seekPage :seekList="seekList" :formLength="3" @search="search"></seekPage>
 </template>
 
 <script>
-export default {
-  data() {
-    // 默认表单数据
-    const defaultWhere = {
-      name: '',
-      status: ''
-    };
+  export default {
+    data() {
+      return {
+        // 表格列配置
+        seekList: [
+          {
+            label: '参数名称:',
+            value: 'inspectionName',
+            type: 'input',
+            placeholder: '请输入'
+          },
 
-    return {
-      // 表单数据
-      where: { ...defaultWhere },
-
-      statusList: [
-        {
-          value: 0,
-          label: '停用'
-        },
-        {
-          value: 1,
-          label: '启用'
-        }
-      ]
-    };
-  },
-  computed: {
-    // 是否开启响应式布局
-    styleResponsive() {
-      return this.$store.state.theme.styleResponsive;
-    }
-  },
-  methods: {
-    /* 搜索 */
-    search() {
-      console.log(this.where);
-      this.$emit('search', this.where);
+          {
+            label: '状态:',
+            value: 'status',
+            type: 'select',
+            placeholder: '请选择',
+            planList: [
+              {
+                value: 0,
+                label: '停用'
+              },
+              {
+                value: 1,
+                label: '启用'
+              }
+            ]
+          },
+          {
+            label: '标准类型:',
+            value: 'qualityStandardType',
+            type: 'DictSelection',
+            dictName: '质检标准类型',
+            placeholder: '请选择'
+          },
+          {
+            label: '标准名称:',
+            value: 'qualityStandardName',
+            type: 'input',
+            placeholder: '请输入'
+          },
+          {
+            label: '标准代码:',
+            value: 'standardCode',
+            type: 'input',
+            placeholder: '请输入'
+          }
+        ]
+      };
     },
-    /*  重置 */
-    reset() {
-      this.where = { ...this.defaultWhere };
-      this.search();
+    computed: {},
+    methods: {
+      /* 搜索 */
+      search(e) {
+        this.$emit('search', { ...e });
+      }
     }
-  }
-};
+  };
 </script>

src/views/inspectionPoint/index.vue

@@ -2,7 +2,12 @@
   <div class="ele-body">
     <el-card shadow="never">
       <search ref="search" @search="reload"></search>
-      <ele-pro-table ref="table" :columns="columns" :datasource="datasource">
+      <ele-pro-table
+        ref="table"
+        :columns="columns"
+        :datasource="datasource"
+        :page-size="20"
+      >
         <!-- 表头工具栏 -->
         <template v-slot:toolbar>
           <el-button

src/views/inspectionProject/components/user-edit.vue

@@ -495,24 +495,27 @@
           const defaultValue = Number(this.form.defaultValue);
           const maxValue = Number(this.form.maxValue);
           const minValue = Number(this.form.minValue);
-          if ((defaultValue != '') & (maxValue != '')) {
-            if (defaultValue > maxValue || defaultValue == maxValue) {
-              this.loading = false;
-              return this.$message.warning('默认值应小于参数上限');
+          if (this.form.textType == 3) {
+            if ((defaultValue != '') & (maxValue != '')) {
+              if (defaultValue > maxValue || defaultValue == maxValue) {
+                this.loading = false;
+                return this.$message.warning('默认值应小于参数上限');
+              }
             }
-          }
-          if ((defaultValue != '') & (minValue != '')) {
-            if (defaultValue < minValue || defaultValue == minValue) {
-              this.loading = false;
-              return this.$message.warning('默认值应大于参数下限');
+            if ((defaultValue != '') & (minValue != '')) {
+              if (defaultValue < minValue || defaultValue == minValue) {
+                this.loading = false;
+                return this.$message.warning('默认值应大于参数下限');
+              }
             }
-          }
-          if ((maxValue != '') & (minValue != '')) {
-            if (maxValue < minValue || maxValue == minValue) {
-              this.loading = false;
-              return this.$message.warning('参数上限应大于参数下限');
+            if ((maxValue != '') & (minValue != '')) {
+              if (maxValue < minValue || maxValue == minValue) {
+                this.loading = false;
+                return this.$message.warning('参数上限应大于参数下限');
+              }
             }
           }
+
           if (this.form.textType == 5) {
             this.form.unitName = 'h';
           }

src/views/inspectionProject/components/user-search.vue

@@ -1,133 +1,75 @@
 <!-- 搜索表单 -->
 <template>
-  <el-form
-    label-width="80px"
-    class="ele-form-search"
-    @keyup.enter.native="search"
-    @submit.native.prevent
-  >
-    <el-row>
-      <el-col v-bind="styleResponsive ? { lg: 4, md: 10 } : { span: 4 }">
-        <el-form-item label="参数编码:">
-          <el-input
-            clearable
-            v-model.trim="where.inspectionCode"
-            placeholder="请输入"
-          />
-        </el-form-item>
-      </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 4, md: 10 } : { span: 4 }">
-        <el-form-item label="参数名称:">
-          <el-input
-            clearable
-            v-model.trim="where.inspectionName"
-            placeholder="请输入"
-          />
-        </el-form-item>
-      </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 4, md: 10 } : { span: 4 }">
-        <el-form-item label="工艺要求:">
-          <el-input
-            clearable
-            v-model.trim="where.inspectionStandard"
-            placeholder="请输入"
-          />
-        </el-form-item>
-      </el-col>
-
-      <el-col v-bind="styleResponsive ? { lg: 4, md: 10 } : { span: 4 }">
-        <el-form-item label="标准类型:" prop="qualityStandardType">
-          <DictSelection
-            dictName="质检标准类型"
-            v-model="where.qualityStandardType"
-          ></DictSelection>
-        </el-form-item>
-      </el-col>
-
-      <el-col v-bind="styleResponsive ? { lg: 4, md: 10 } : { span: 4 }">
-        <el-form-item label="标准名称:">
-          <el-select
-            v-model="where.qualityStandardId"
-            placeholder="请选择"
-            style="width: 100%"
-            clearable
-            filterable
-          >
-            <el-option
-              :label="item.name"
-              v-for="item in qualityStandardList"
-              :key="item.id"
-              :value="item.id"
-            />
-          </el-select>
-        </el-form-item>
-      </el-col>
-
-      <el-col
-        v-bind="styleResponsive ? { lg: 4, md: 8 } : { span: 4 }"
-        style="text-align: right"
-      >
-        <el-button
-          type="primary"
-          icon="el-icon-search"
-          class="ele-btn-icon"
-          @click="search"
-        >
-          查询
-        </el-button>
-        <el-button @click="reset">重置</el-button>
-      </el-col>
-    </el-row>
-  </el-form>
+  <seekPage :seekList="seekList" :formLength="3" @search="search"></seekPage>
 </template>
 
 <script>
   import { getList } from '@/api/inspectionStandard';
   export default {
     data() {
-      // 默认表单数据
-      const defaultWhere = {
-        inspectionCode: '',
-        inspectionName: '',
-        qualityStandardType: '',
-        inspectionStandard: '',
-        qualityStandardId: ''
-      };
       return {
-        // 表单数据
-        where: { ...defaultWhere },
         qualityStandardList: []
       };
     },
     computed: {
-      // 是否开启响应式布局
-      styleResponsive() {
-        return this.$store.state.theme.styleResponsive;
+      seekList() {
+        return [
+          {
+            label: '参数编码:',
+            value: 'inspectionCode',
+            type: 'input',
+            placeholder: '请输入'
+          },
+          {
+            label: '参数名称:',
+            value: 'inspectionName',
+            type: 'input',
+            placeholder: '请输入'
+          },
+          {
+            label: '工艺要求:',
+            value: 'inspectionStandard',
+            type: 'input',
+            placeholder: '请输入'
+          },
+          {
+            label: '标准类型:',
+            value: 'qualityStandardType',
+            type: 'DictSelection',
+            dictName: '质检标准类型',
+            placeholder: '请选择'
+          },
+          {
+            label: '标准名称:',
+            value: 'qualityStandardId',
+            type: 'select',
+            placeholder: '请选择',
+            planList: this.qualityStandardList.map(item=>({ 
+              label: item.name,
+              value: item.id
+            }))
+          },
+          {
+            label: '标准代码:',
+            value: 'standardCode',
+            type: 'input',
+            placeholder: '请输入'
+          }
+        ];
       }
     },
     created() {
-      this.getListFn();
+      getList({
+        pageNum: 1,
+        size: -1
+      }).then((res) => {
+        this.qualityStandardList = res.list
+      });
     },
     methods: {
       /* 搜索 */
-      search() {
-        this.$emit('search', this.where);
-      },
-      /*  重置 */
-      reset() {
-        this.where = { ...this.defaultWhere };
-        this.search();
-      },
-
-      getListFn() {
-        let param = {
-          pageNum: 1,
-          size: -1
-        };
-
-        getList(param).then((res) => {
-          this.qualityStandardList = res.list;
-        });
+      search(e) {
+        this.$emit('search', { ...e });
       }
     }
   };

src/views/inspectionProject/index.vue

@@ -10,6 +10,7 @@
         :datasource="datasource"
         :selection.sync="selection"
         row-key="code"
+        :page-size="20"
       >
         <!-- 表头工具栏 -->
         <template v-slot:toolbar>
@@ -226,6 +227,12 @@
             align: 'center',
             minWidth: 110
           },
+          {
+            prop: 'standardCode',
+            label: '标准代码',
+            align: 'center',
+            minWidth: 110
+          },
 
           {
             prop: 'toolList',

src/views/inspectionStandard/index.vue

@@ -7,6 +7,7 @@
         :columns="columns"
         :datasource="datasource"
         cache-key="systemRoleTable1"
+        :page-size="20"
       >
         <!-- 表头工具栏 -->
         <template v-slot:toolbar>

src/views/inspectionStatistics/qualityControlWorkOrder/index.vue

@@ -10,6 +10,8 @@
         :selection.sync="selection"
         @expand-change="expandChange"
         class="table"
+        :page-size="20"
+
       >
         <ele-toolbar>
           <!-- 默认插槽添加左边内容 -->

src/views/inspectionTemplate/index.vue

@@ -17,6 +17,7 @@
         cache-key="inspectionClassify"
         row-key="id"
         @selection-change="selectionChangeHandle"
+        :page-size="20"
       >
         <template v-slot:toolbar>
           <el-button

src/views/inspectionWork/components/baseInfo.vue

@@ -233,6 +233,7 @@
               placeholder="请选择"
               style="width: 100%"
               :disabled="showArrange == '0'"
+              @change="selectResult"
             >
               <el-option label="合格" :value="1" />
               <el-option label="不合格" :value="2" />
@@ -515,8 +516,8 @@
           this.form[val].replace(/[^\d]/g, '').replace(/^0+/, '') || '0';
       },
       // *** 计算合格数 不合格数
-      quantityCalculation(e,noSetSampleList) {
-        console.log(this.form,'执行没有');
+      quantityCalculation(e, noSetSampleList) {
+        console.log(this.form, '执行没有');
         // return
         // return
         let qualifiedNumber = this.form.qualifiedNumber - 0;
@@ -543,7 +544,11 @@
         let failureRate = ((noQualifiedNumber / total) * 100).toFixed(2);
         this.form.qualificationRate = passRate + '%';
         this.form.noQualificationRate = failureRate + '%';
-         if (this.form.qualityMode == 1 && this.form.isUnpack == 2&&!noSetSampleList) {
+        if (
+          this.form.qualityMode == 1 &&
+          this.form.isUnpack == 2 &&
+          !noSetSampleList
+        ) {
           this.$emit('quantityCalculation', qualifiedNumber);
         }
         return true;
@@ -703,8 +708,12 @@
           this.$emit('table2');
         }
       },
+      //抽检需要重新计算
       selectResult() {
-        this.$emit('quantityAssignment');
+        console.log(this.form.qualityMode,'this.form.qualityMode')
+        if (this.form.qualityMode == 2) {
+          this.$emit('quantityAssignment');
+        }
       }
     }
   };

src/views/inspectionWork/edit.vue

@@ -431,6 +431,16 @@
         }
         this.$set(this.form, 'qualifiedNumber', qualifiedNumber);
         this.$set(this.form, 'noQualifiedNumber', noQualifiedNumber);
+        this.$set(
+          this.form,
+          'qualificationRate',
+          ((qualifiedNumber / total) * 100).toFixed(2)+ '%'
+        );
+        this.$set(
+          this.form,
+          'noQualificationRate',
+          ((noQualifiedNumber / total) * 100).toFixed(2)+ '%'
+        );
       },
       //切换检验方式
       changeModel(val, flag) {

src/views/unqualifiedProduct/unqualifiedList/concessionacceptance/index.vue

@@ -8,6 +8,8 @@
         :columns="columns"
         :datasource="datasource"
         :selection.sync="selection"
+        :page-size="20"
+
       >
         <template v-slot:action="{ row }">
           <el-popconfirm

src/views/unqualifiedProduct/unqualifiedList/consumeproducts/index.vue

@@ -8,6 +8,8 @@
         :columns="columns"
         :datasource="datasource"
         :selection.sync="selection"
+        :page-size="20"
+
       >
         <template v-slot:action="{ row }">
           <el-popconfirm

src/views/unqualifiedProduct/unqualifiedList/downgradeuse/index.vue

@@ -8,6 +8,8 @@
         :columns="columns"
         :datasource="datasource"
         :selection.sync="selection"
+        :page-size="20"
+
       >
         <template v-slot:action="{ row }">
           <el-popconfirm

src/views/unqualifiedProduct/unqualifiedList/index.vue

@@ -3,7 +3,12 @@
   <div class="ele-body">
     <el-card shadow="never" v-loading="loading">
       <order-search @search="reload" ref="searchRef"> </order-search>
-      <ele-pro-table ref="table" :columns="columns" :datasource="datasource">
+      <ele-pro-table
+        ref="table"
+        :columns="columns"
+        :datasource="datasource"
+        :page-size="20"
+      >
         <!-- 操作列 -->
         <template v-slot:toolbar>
           <el-button type="primary" @click="open()">新建</el-button>

src/views/unqualifiedProduct/unqualifiedList/keepsample/index.vue

@@ -8,6 +8,8 @@
         :columns="columns"
         :datasource="datasource"
         :selection.sync="selection"
+        :page-size="20"
+
       >
         <template v-slot:action="{ row }">
           <el-popconfirm

src/views/unqualifiedProduct/unqualifiedList/probationalGoods/index.vue

@@ -8,6 +8,8 @@
         :columns="columns"
         :datasource="datasource"
         :selection.sync="selection"
+        :page-size="20"
+
       >
         <template v-slot:action="{ row }">
           <el-popconfirm

src/views/unqualifiedProduct/unqualifiedList/refuseManagement/index.vue

@@ -8,6 +8,8 @@
         :columns="columns"
         :datasource="datasource"
         :selection.sync="selection"
+        :page-size="20"
+
       >
         <template v-slot:action="{ row }">
           <el-popconfirm

src/views/unqualifiedProduct/unqualifiedList/returngoods/index.vue

@@ -8,6 +8,8 @@
         :columns="columns"
         :datasource="datasource"
         :selection.sync="selection"
+        :page-size="20"
+
       >
         <template v-slot:action="{ row }">
           <el-popconfirm

src/views/unqualifiedProduct/unqualifiedList/rework/index.vue

@@ -9,6 +9,8 @@
         :datasource="datasource"
         :selection.sync="selection"
         row-key="id"
+        :page-size="20"
+
       >
         <!-- 操作列 -->
         <template v-slot:toolbar>