Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend into dengfei

src/api/material/list.js

@@ -1,5 +1,5 @@
 import request from '@/utils/request';
-import {download} from "@/utils/file";
+import { download } from '@/utils/file';
 
 // 获取列表
 export async function getGroupPage(data) {
@@ -72,14 +72,15 @@ export async function removeMaterial(id) {
 
 //根据产品ID bom获取工艺路线列表【产品管理】
 export async function getBomRoutingList(categoryId) {
-  const res = await request.get(`/main/bomCategory/bomRoutingListByCategoryId/${categoryId}`);
+  const res = await request.get(
+    `/main/bomCategory/bomRoutingListByCategoryId/${categoryId}`
+  );
   if (res.data.code == 0) {
     return res.data.data;
   }
   return Promise.reject(new Error(res.data.message));
 }
 
-
 // 根据产品ID获取bom列表
 export async function getBomAssociationList(params) {
   const res = await request.get(`/main/bomCategory/getList`, { params });
@@ -89,7 +90,6 @@ export async function getBomAssociationList(params) {
   return Promise.reject(new Error(res.data.message));
 }
 
-
 // 产品工序与模具关联
 export async function categoryTaskPallet(data) {
   const res = await request.post(`/main/category/categoryTaskPallet`, data);
@@ -134,22 +134,19 @@ export async function deletePackageDisposition(data) {
 
 // 查询质检方案列表
 export async function getQualityTemplate(data) {
-  const res = await request.get(
-    `/main/category/getQualityTemplate`
-  );
+  const res = await request.get(`/qms/qualitytemplate/page`, {
+    params: data
+  });
   if (res.data.code == 0) {
     return res.data.data;
   }
   return Promise.reject(new Error(res.data.message));
 }
 
-
 // 导出
 export async function exportFile(data) {
-  const res = await request.post(
-    '/main/category/export',data,{
-      responseType: 'blob'
-    }
-  );
-  download(res.data,'产品/物品数据.xlsx')
+  const res = await request.post('/main/category/export', data, {
+    responseType: 'blob'
+  });
+  download(res.data, '产品/物品数据.xlsx');
 }

src/components/common/seekPage.vue

@@ -14,7 +14,7 @@
                 clearable
                 v-model="defaultWhere[item.value]"
                 :placeholder="item.placeholder || '请输入内容'"
-                :style="{ width: item.width ? item.width + 'px' : '220px' }"
+                :style="{ width: item.width ? item.width + 'px' : '230px' }"
               />
             </div>
             <div v-if="item.type == 'select'">
@@ -24,7 +24,7 @@
                 :multiple="item.multiple ? item.multiple : false"
                 :filterable="item.filterable ? item.filterable : true"
                 :placeholder="item.placeholder || '请选择'"
-                :style="{ width: item.width ? item.width + 'px' : '220px' }"
+                :style="{ width: item.width ? item.width + 'px' : '230px' }"
               >
                 <el-option
                   v-for="(op, i) in item.planList"
@@ -46,7 +46,7 @@
                 labelKey="name"
                 :placeholder="item.placeholder || '请选择'"
                 default-expand-all
-                :style="{ width: item.width ? item.width + 'px' : '220px' }"
+                :style="{ width: item.width ? item.width + 'px' : '230px' }"
               />
             </div>
             <div v-if="item.type == 'date'">
@@ -58,7 +58,7 @@
                 start-placeholder="开始日期"
                 end-placeholder="结束日期"
                 value-format="yyyy-MM-dd HH:mm:ss"
-                :style="{ width: item.width ? item.width + 'px' : '220px' }"
+                :style="{ width: item.width ? item.width + 'px' : '380px' }"
               >
               </el-date-picker>
             </div>
@@ -99,7 +99,7 @@
                           v-model="defaultWhere[item.value]"
                           :placeholder="item.placeholder || '请输入内容'"
                           :style="{
-                            width: item.width ? item.width + 'px' : '220px'
+                            width: item.width ? item.width + 'px' : '230px'
                           }"
                         />
                       </div>
@@ -111,7 +111,7 @@
                           :filterable="item.filterable ? item.filterable : true"
                           :placeholder="item.placeholder || '请选择'"
                           :style="{
-                            width: item.width ? item.width + 'px' : '220px'
+                            width: item.width ? item.width + 'px' : '230px'
                           }"
                           @visible-change="change"
                           @change="handerChange"
@@ -137,7 +137,7 @@
                           :placeholder="item.placeholder || '请选择'"
                           default-expand-all
                           :style="{
-                            width: item.width ? item.width + 'px' : '220px'
+                            width: item.width ? item.width + 'px' : '230px'
                           }"
                         />
                       </div>
@@ -151,7 +151,7 @@
                           end-placeholder="结束日期"
                           value-format="yyyy-MM-dd HH:mm:ss"
                           :style="{
-                            width: item.width ? item.width + 'px' : '220px'
+                            width: item.width ? item.width + 'px' : '230px'
                           }"
                         >
                         </el-date-picker>
@@ -257,6 +257,18 @@
       },
 
       search() {
+        let valueAr = this.seekList.filter((item) => item.valueAr);
+        valueAr.forEach((item) => {
+          let data = this.defaultWhere[item.value];
+          if (data) {
+            this.defaultWhere[item.valueAr[0]] = data[0];
+            this.defaultWhere[item.valueAr[1]] = data[1];
+          } else {
+            delete this.defaultWhere[item.valueAr[0]];
+            delete this.defaultWhere[item.valueAr[1]];
+          }
+          delete this.defaultWhere[item.value];
+        });
         this.$emit('search', this.defaultWhere);
       },
       // 重置

src/views/bpm/definition/index.vue

@@ -151,6 +151,7 @@ export default {
       return await getProcessDefinitionPage({
         pageNo: page,
         pageSize: limit,
+        key:this.$route.query.key
       });
     },
     /** 流程图的详情按钮操作 */

src/views/bpm/model/index.vue

@@ -79,7 +79,7 @@
           </el-tooltip>
         </el-form-item>
         <el-form-item label="流程名称" prop="name">
-          <el-input v-model="form.name" placeholder="请输入流程名称" :disabled="!!form.id" clearable/>
+          <el-input v-model="form.name" placeholder="请输入流程名称" clearable/>
         </el-form-item>
         <el-form-item label="流程描述" prop="description">
           <el-input type="textarea" v-model="form.description" clearable/>

src/views/material/product/components/QualityInfo.vue

@@ -10,7 +10,12 @@
       </div>
       <el-row :gutter="24">
         <el-col :span="4">
-          <el-form-item :label="form.dataType == 1?'是否采购来料检验':'是否委外来料检验'" prop="isComeCheck">
+          <el-form-item
+            :label="
+              form.dataType == 1 ? '是否采购来料检验' : '是否委外来料检验'
+            "
+            prop="isComeCheck"
+          >
             <el-radio v-model="form.isComeCheck" :label="1">是</el-radio>
             <el-radio v-model="form.isComeCheck" :label="0">否</el-radio>
           </el-form-item>
@@ -169,9 +174,8 @@
       //     };
       //   });
       // },
-      levelChange(val){
-        this.form.levelItem=val
-
+      levelChange(val) {
+        this.form.levelItem = val;
       },
       async getDictListIqoCode(code) {
         let { data: res } = await getByCode(code);
@@ -184,8 +188,13 @@
         });
       },
       getQualityTemplateList() {
-        getQualityTemplate().then((res) => {
-          this.qualityTemplateList = res;
+        getQualityTemplate({
+          type: this.form.dataType == 1 ? 1 : 6,
+          status: 1,
+          size: 999
+        }).then((res) => {
+          console.log(res,'res')
+          this.qualityTemplateList = res.list;
         });
       }
     }

src/views/material/product/components/WarehouseInfo.vue

@@ -112,7 +112,7 @@
                 </el-col>
                 <el-col :span="24">
                   <el-form-item label="最小包装单元">
-                    <el-input class="packingUnit" v-model="items.minPackageCell" placeholder="请输入内容"></el-input>
+                    <el-input class="packingUnit" v-model="items.minPackageCell" placeholder="请输入内容" type="number"></el-input>
                     <div class="packingUnit">
                       <DictSelection dictName="计量单位" clearable v-model="items.packageUnit" :isProhibit="true">
                       </DictSelection>
@@ -126,7 +126,7 @@
                 </el-col>
                 <el-col :span="24">
                   <el-form-item label="内包装单元">
-                    <el-input class="packingUnit" v-model="items.inPackageCell" placeholder="请输入内容"></el-input>
+                    <el-input class="packingUnit" v-model="items.inPackageCell" placeholder="请输入内容" type="number"></el-input>
                     <div class="packingUnit">
                       <DictSelection dictName="计量单位" clearable v-model="items.minConversionUnit">
                       </DictSelection>
@@ -140,7 +140,7 @@
                 </el-col>
                 <el-col :span="24">
                   <el-form-item label="外包装单元">
-                    <el-input class="packingUnit" v-model="items.outPackageCell" placeholder="请输入内容"></el-input>
+                    <el-input class="packingUnit" v-model="items.outPackageCell" placeholder="请输入内容" type="number"></el-input>
                     <div class="packingUnit">
                       <DictSelection dictName="计量单位" clearable v-model="items.inConversionUnit">
                       </DictSelection>

src/views/system/operationLog/components/search.vue

@@ -1,87 +1,39 @@
 <!-- 搜索表单 -->
 <template>
-  <el-form
-    label-width="100px"
-    class="ele-form-search"
-    @keyup.enter.native="search"
-    @submit.native.prevent
-  >
-    <el-row :gutter="15">
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="操作描述:">
-          <el-input
-            clearable
-            v-model.trim="where.description"
-            placeholder="请输入"
-          />
-        </el-form-item>
-      </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="操作时间：" prop="createTime">
-          <el-date-picker
-            v-model="createTime"
-            type="datetimerange"
-            style="width: 100%"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            start-placeholder="开始时间"
-            end-placeholder="结束时间"
-          
-          >
-          </el-date-picker>
-        </el-form-item>
-      </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <div class="ele-form-actions">
-          <el-button
-            type="primary"
-            icon="el-icon-search"
-            class="ele-btn-icon"
-            @click="search"
-          >
-            查询
-          </el-button>
-          <el-button @click="reset">重置</el-button>
-        </div>
-      </el-col>
-    </el-row>
-  </el-form>
+  <seekPage :seekList="seekList" :formLength="3" @search="search"></seekPage>
 </template>
 
 <script>
   export default {
     data() {
-      // 默认表单数据
-      const defaultWhere = {
-        description: '',
-        beginTime: '',
-        endTime: ''
-      };
-      return {
-        createTime: [],
-        // 表单数据
-        where: { ...defaultWhere }
-      };
+      return {};
     },
     computed: {
-      // 是否开启响应式布局
-      styleResponsive() {
-        return this.$store.state.theme.styleResponsive;
+      // 表格列配置
+      seekList() {
+        return [
+          {
+            label: '操作描述：',
+            value: 'description',
+            type: 'input'
+          },
+          {
+            label: '操作时间：',
+            value: 'createTime',
+            type: 'date',
+            dateType: 'datetimerange',
+            placeholder: '',
+            valueAr: ['beginTime', 'endTime']
+          }
+        ];
       }
     },
     methods: {
       /* 搜索 */
-      search() {
-        if(this.createTime.length){
-          this.where.beginTime=this.createTime?.[0]
-          this.where.endTime=this.createTime?.[1]
-        }  
-        this.$emit('search', this.where);
-      },
-      /*  重置 */
-      reset() {
-        this.createTime=[]
-        this.where = { ...this.defaultWhere };
-        this.search();
+      search(e) {
+        this.$emit('search', {
+          ...e
+        });
       }
     }
   };