Browse Source

报错修复

lucw 7 months ago
parent
commit
74f8effe9c

+ 14 - 8
src/components/common/seekPage.vue

@@ -14,8 +14,9 @@
                 clearable
                 v-model="defaultWhere[item.value]"
                 :placeholder="item.placeholder || '请输入内容'"
-                :style="{ width: item.width ? item.width + 'px' : '220px' }" 
-                 @keyup.enter.native="search"              />
+                :style="{ width: item.width ? item.width + 'px' : '220px' }"
+                @keyup.enter.native="search"
+              />
             </div>
             <div v-if="item.type == 'select'">
               <el-select
@@ -60,14 +61,14 @@
         </el-form-item>
       </el-form-item>
 
-      <el-form-item>
+      <el-form-item v-if="seekList.length > formLength">
         <el-dropdown
           ref="dropdownref"
           trigger="click"
           :hide-on-click="false"
           v-model="dropdownVisible"
         >
-          <div v-if="seekList.length > formLength">
+          <div>
             <span class="el-dropdown-link">
               更多选项<i class="el-icon-arrow-down el-icon--right"></i>
             </span>
@@ -96,7 +97,8 @@
                             width: item.width ? item.width + 'px' : '220px'
                           }"
                           @keydown.enter.native="() => search()"
-                          @keyup.enter.native="() => search()"                        />
+                          @keyup.enter.native="() => search()"
+                        />
                       </div>
                       <div v-if="item.type == 'select'">
                         <el-select
@@ -136,7 +138,7 @@
                         </el-date-picker>
                       </div>
                       <div v-if="item.type == 'DictSelection'">
-                        <DictSelection
+                        <dict-selection
                           v-model="defaultWhere[item.value]"
                           :placeholder="item.placeholder || '请选择内容'"
                           :multiple="item.multiple ? item.multiple : false"
@@ -144,7 +146,8 @@
                             width: item.width ? item.width + 'px' : '220px'
                           }"
                           :dictName="item.dictName"
-                        />
+                        >
+                        </dict-selection>
                       </div>
                       <div v-if="item.type == 'picker'">
                         <el-date-picker
@@ -194,7 +197,10 @@
         type: [Number],
         default: 3
       },
-      keyValue: ''
+      keyValue: {
+        type: String,
+        default: ''
+      }
     },
     mounted() {
       let whereObj = sessionStorage[this.keyValue];

+ 1 - 1
src/views/inspectionWork/components/addSample.vue

@@ -217,7 +217,7 @@
     </el-form>
 
     <template v-slot:footer>
-      <el-button type="primary" @click="save()" v-lodading="loading"
+      <el-button type="primary" @click="save()" v-loading="loading"
         >确认</el-button
       >
 

+ 7 - 1
src/views/unqualifiedProduct/unqualifiedList/components/EquipmentDialog.vue

@@ -78,8 +78,14 @@ export default {
   },
   mixins: [tabMixins],
   props: {
-    selectList: Array,
+    selectList: {
+      type: Array,
+      default: () => {
+        return [];
+      }
+    },
     type: {
+      type: Number,
       default: 2 //1多选 2单选
     },
     treeIds: {

+ 5 - 10
src/views/unqualifiedProduct/unqualifiedList/components/create.vue

@@ -31,11 +31,7 @@
         </el-col>
         <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
           <el-form-item label="数量:">
-            <el-input
-              :maxlength="20"
-              v-model="form.quantity"
-              disabled
-            />
+            <el-input :maxlength="20" v-model="form.quantity" disabled />
           </el-form-item>
         </el-col>
 
@@ -187,7 +183,7 @@
     </template>
 
     <!-- 选择产品 -->
-    <EquipmentDialog ref="equipmentRefs" @choose="confirmChoose">
+    <EquipmentDialog ref="equipmentRefs" @choose="confirmChoose" :type="1">
     </EquipmentDialog>
     <ProductionVersion
       ref="versionRefs"
@@ -221,7 +217,7 @@
             callback();
           }
         },
-        id:'',
+        id: '',
         visible: false,
         loading: false,
         produceTaskList: [],
@@ -343,7 +339,7 @@
         // this.form = row;
 
         const data = await getById(row.id);
-        this.form.id=row.id
+        this.form.id = row.id;
         this.form.unqualifiedProductsCode = data.unqualifiedProductsCode;
         this.form.sourceCode = data.sourceCode;
         this.form.batchNo = data.batchNo;
@@ -367,7 +363,6 @@
         this.form.poList = data.poList;
 
         console.log(this.form);
-        
 
         // getDetail(row.id).then((res) => {
         //   // this.getProduceTaskList();
@@ -460,7 +455,7 @@
           }
 
           if (this.title == '修改') {
-            updateData({...this.form,id:this.id})
+            updateData({ ...this.form, id: this.id })
               .then((res) => {
                 this.loading = false;
                 this.$message.success('成功');

+ 1 - 1
src/views/unqualifiedProduct/unqualifiedList/reasonType/components/edit.vue

@@ -49,7 +49,7 @@
       <el-button
         type="primary"
         @click="save()"
-        v-lodading="loading"
+        v-loading="loading"
         v-if="title != '详情'"
         >保存</el-button
       >

+ 2 - 1
src/views/unqualifiedProduct/unqualifiedList/reasonType/index.vue

@@ -67,7 +67,8 @@
     data() {
       return {
         cacheKeyUrl: 'qms-c2e9664a-reasonType-index',
-        loading: false
+        loading: false,
+        selection: []
       };
     },
     computed: {

+ 1 - 1
src/views/unqualifiedProduct/unqualifiedList/unqualifiedName/components/edit.vue

@@ -69,7 +69,7 @@
       <el-button
         type="primary"
         @click="save()"
-        v-lodading="loading"
+        v-loading="loading"
         v-if="title != '详情'"
         >保存</el-button
       >

+ 0 - 1
src/views/unqualifiedProduct/unqualifiedList/unqualifiedName/components/order-search.vue

@@ -1,5 +1,4 @@
 <!-- 搜索表单 -->
-6
 <template>
   <seekPage :seekList="seekList" :formLength="3" @search="search"></seekPage>
 </template>

+ 4 - 4
src/views/unqualifiedProduct/unqualifiedList/unqualifiedName/index.vue

@@ -11,6 +11,7 @@
         :page-size="20"
         @columns-change="handleColumnChange"
         :cache-key="cacheKeyUrl"
+        row-key="id"
       >
         <!-- 表头工具栏 -->
         <template v-slot:toolbar>
@@ -20,7 +21,7 @@
             icon="el-icon-plus"
             class="ele-btn-icon"
             @click="openEdit('add')"
-          v-if="$hasPermission('qms:badname:save')"
+            v-if="$hasPermission('qms:badname:save')"
           >
             新增
           </el-button>
@@ -31,7 +32,6 @@
             :underline="false"
             @click="openEdit('edit', row)"
             v-if="$hasPermission('qms:badname:update')"
-
           >
             修改
           </el-link>
@@ -40,7 +40,6 @@
             title="确定要删除吗?"
             @confirm="remove(row)"
             v-if="$hasPermission('qms:badname:delete')"
-
           >
             <template v-slot:reference>
               <el-link type="danger" :underline="false" icon="el-icon-delete">
@@ -69,7 +68,8 @@
     data() {
       return {
         cacheKeyUrl: 'qms-c2e9664a-unqualifiedName-index',
-        loading: false
+        loading: false,
+        selection: []
       };
     },
     computed: {

+ 1 - 1
src/views/unqualifiedProduct/unqualifiedList/unqualifiedType/components/edit.vue

@@ -49,7 +49,7 @@
       <el-button
         type="primary"
         @click="save()"
-        v-lodading="loading"
+        v-loading="loading"
         v-if="title != '详情'"
         >保存</el-button
       >

+ 3 - 1
src/views/unqualifiedProduct/unqualifiedList/unqualifiedType/index.vue

@@ -13,6 +13,7 @@
         :cache-key="cacheKeyUrl"
         height="calc(100vh - 350px)"
         full-height="calc(100vh - 120px)"
+        row-key="id"
       >
         <!-- 表头工具栏 -->
         <template v-slot:toolbar>
@@ -69,7 +70,8 @@
     data() {
       return {
         cacheKeyUrl: 'qms-c2e9664a-unqualifiedType-index',
-        loading: false
+        loading: false,
+        selection: []
       };
     },
     computed: {

File diff suppressed because it is too large
+ 309 - 207
yarn.lock


Some files were not shown because too many files changed in this diff