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

src/views/documentManagement/certificateManagement/components/detail-dialog.vue

@@ -40,7 +40,7 @@
         </el-descriptions-item>
         <el-descriptions-item :span="2">
           <template slot="label"> 有效期至 </template>
-          {{ form.validityStartTime + ' — ' + form.validityEndTime }}
+          {{ (form.validityStartTime ? form.validityStartTime : '') + ' — ' + (form.validityEndTime ? form.validityEndTime : '') }}
         </el-descriptions-item>
         <el-descriptions-item>
           <template slot="label"> 状态 </template>

src/views/documentManagement/certificateManagement/index.vue

@@ -25,18 +25,18 @@
           <!-- <el-button type="primary" @click="handleUpload">导入</el-button> -->
         </template>
         <template v-slot:code="{ row }">
-          <el-link type="primary" :underline="false" @click="openDetail(row)">{{
-            row.code
-          }}</el-link>
-          <p class="ele-text-info" v-if="['1'].includes(row.holderType)">
-            {{ getDictValue('证件类型', row.type) }}
-          </p>
-          <p
-            class="ele-text-info"
-            v-if="['2', '3', '4', '5', '6'].includes(row.holderType)"
-          >
-            {{ getDictValue('客户/供应商资质类型', row.type) }}
-          </p>
+          <el-link type="primary" :underline="false" @click="openDetail(row)">
+            <p>{{ row.code }}</p>
+            <p class="ele-text-info" style="color: #409eff;" v-if="['1'].includes(row.holderType)">
+              {{ getDictValue('证件类型', row.type) }}
+            </p>
+            <p
+              class="ele-text-info"  style="color: #409eff;"
+              v-if="['2', '3', '4', '5', '6'].includes(row.holderType)"
+            >
+              {{ getDictValue('客户/供应商资质类型', row.type) }}
+            </p>
+          </el-link>
         </template>
         <template v-slot:time="{ row }">
           <p>起：{{ row.validityStartTime }}</p>

src/views/factoryModel/station/index.vue

@@ -92,7 +92,7 @@
       :apiUrl="'/main/factoryworkstation/importBatch'"
       :fileUrl="'/main/factoryworkstation/downLoadTemplate'"
       fileName="工位导入模板"
-      @success="reload"
+      @success="done"
     />
   </div>
 </template>

src/views/material/BOMmanage/qualityTesting/term.vue

@@ -13,9 +13,9 @@
       @fullscreen-change="fullscreenChange"
     >
       <template v-slot:toolbar>
-        <el-button @click="handAdd" size="mini" type="primary" v-if="!isView&&isQualityInspection" 
+        <!-- <el-button @click="handAdd" size="mini" type="primary" v-if="!isView&&isQualityInspection"
           >新增质检项</el-button
-        >
+        > -->
         <el-button @click="handSelect" size="mini" type="primary" v-if="!isView"
           >选择质检方案</el-button
         >

src/views/material/product/detail.vue

@@ -450,6 +450,11 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="物联产品Key">
+              <el-input v-model="form.iotProductKey" />
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
     </el-card>
@@ -681,6 +686,7 @@
         isUpdate: 0,
         form: {
           categoryLevelGroupName: '',
+          iotProductKey: '',
           componentAttribute: [],
           categoryLevelName: '',
           isConsumable: 0,
@@ -1045,7 +1051,7 @@
               'netWeight',
               parseFloat((volume * 7.85) / 1000).toFixed(4)
             );
-          }else{
+          } else {
             this.$set(this.form, 'netWeight', 0);
           }
 

src/views/rulesManagement/components/programRulesDialog.vue

@@ -497,6 +497,9 @@ export default {
       }
     }
   },
+  mounted() {
+    this.getUserList({groupId: "1"});
+  },
   methods: {
     // 初始化
     async init(row, tips) {
@@ -900,7 +903,7 @@ export default {
     },
 
     removeTab(targetRuleId) {
-      this.$confirm('是否删除当前工序?', '提示', {
+      this.$confirm('是否删除当前规则?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'

src/views/rulesManagement/recordPlan/components/programRulesDialog.vue

@@ -884,8 +884,22 @@
           this.addForm.executeIdList = this.addForm.executeUser.map(
             (item) => item.userId
           );
-          this.addForm.groupId = this.addForm.executeUser[0]?.groupId || '';
-          this.searchDeptNodeClick(this.addForm.groupId);
+
+          let groupIds = this.addForm.executeUser
+            .map((i) => i.groupId)
+            .filter((i) => i);
+          groupIds = Array.from(new Set(groupIds));
+
+          if (groupIds.includes('1')) {
+            // 包含全部部门，置空
+            this.addForm.groupId = '1';
+          } else {
+            this.addForm.groupId = this.addForm.executeUser[0]?.groupId || '1';
+          }
+
+          groupIds.map((item) => {
+            this.searchDeptNodeClick(item);
+          });
         } else {
           // 班组
           this.addForm.teamId = this.addForm.executeUser[0]?.teamId || '';

src/views/rulesManagement/releaseRules/components/permitAdd.vue

@@ -138,8 +138,12 @@
               type="date"
               placeholder="请选择启用日期"
               style="width: 100%"
+              :picker-options="{
+                disabledDate: (time) =>
+                  time.getTime() < new Date(new Date().toDateString()).getTime()
+              }"
               :disabled="type == 'processEdit'"
-            ></el-date-picker>
+            />
           </el-form-item>
         </el-col>
 
@@ -1198,6 +1202,7 @@
           });
 
           this.formData.startDate = new Date(data.startDate);
+
           this.formData.stopDate = new Date(data.stopDate);
           this.formData.classify = this.formData.classify + '';
           this.formData.industryType = this.formData.industryType + '';
@@ -1219,6 +1224,13 @@
             this.formData.executeMethodId = null;
             this.formData.executeMethodName = '';
             this.executeMethodList = [];
+
+            // startDate 小于当前日期则取当前日期
+            const now = new Date();
+            if (this.formData.startDate < now) {
+              this.formData.startDate = now;
+            }
+
           } else {
             this.getExecuteMethodList();
           }

vue.config.js

@@ -40,7 +40,7 @@ module.exports = {
         target: 'http://192.168.1.125:18086',
         // target: 'http://192.168.1.251:18186',
         // target: 'http://192.168.1.125:18086',
-        // target: 'http://192.168.1.251:18186', // 测试环境
+        target: 'http://192.168.1.251:18186', // 测试环境
         // target: 'http://192.168.1.251:18087',
         // target: 'http://192.168.1.116:18086',
         // target: 'http://192.168.1.251:18086',