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

src/views/factoryModel/station/components/ProduceDialogAll.vue

@@ -188,6 +188,7 @@
           ...where,
           ...this.searchData,
           pageNum: page,
+          workCenterId:this.forData.extInfo.workCenterId,
           size: limit
         });
         return res;

src/views/factoryModel/station/components/edit.vue

@@ -92,19 +92,19 @@
                 v-model="form.extInfo.teamId"
                 clearable
                 :filterable="true"
-                @change="userListFn"
               >
                 <el-option
                   v-for="item in teamPagerList"
                   :key="item.id"
                   :label="item.name"
                   :value="item.id"
+                  @click.native="userListFn(item)"
                 />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="人员:" prop="extInfo.teamId">
+            <el-form-item label="人员:" prop="extInfo.userIds">
               <el-select
                 style="width: 100%"
                 v-model="form.extInfo.userIds"
@@ -247,7 +247,7 @@
                 @click.native="handleProduce"
               ></el-input>
             </el-form-item>
-          </el-col>
+          </el-col> -->
 
           <el-col :span="8">
             <el-form-item label="所属工作中心:" prop="extInfo.workCenterId">
@@ -267,7 +267,7 @@
                 </el-option>
               </el-select>
             </el-form-item>
-          </el-col> -->
+          </el-col>
 
           <el-col :span="8">
             <el-form-item label="状态:" prop="enabled">
@@ -495,14 +495,20 @@
           'extInfo.assetName': [
             { required: true, message: '请选择', trigger: 'change' }
           ],
-          'extInfo.workshopId': {
+          'extInfo.assetName': [
+            { required: true, message: '请选择', trigger: 'change' }
+          ],
+          'extInfo.assetName': [
+            { required: true, message: '请选择', trigger: 'change' }
+          ],
+          'extInfo.teamId': {
             required: true,
-            message: '请输入',
+            message: '请选择',
             trigger: 'change'
           },
-          'extInfo.workCenterId': {
+          'extInfo.userIds': {
             required: true,
-            message: '请输入',
+            message: '请选择',
             trigger: 'change'
           },
           taskNames: {
@@ -591,13 +597,14 @@
         this.$refs.productRefs.open(this.form.extInfo, '选择设备', '4');
       },
       userListFn(e, init) {
-        console.log(e);
-        let that = this;
-        listUserByIds([e]).then((res) => {
-          that.userList = res;
+        listUserByIds([e.teamId || e.id]).then((res) => {
+          this.userList = res;
         });
         if (!init) {
-          that.form.extInfo.userIds = [];
+          this.form.extInfo.userIds = [];
+          if (e.workCenterIds.length) {
+            this.form.extInfo.workCenterId = e.workCenterIds[0];
+          }
         }
       },
 
@@ -614,8 +621,6 @@
 
         this.form.taskIds = [data.id];
         this.form.taskNames = [data.name];
-
-        this.form.extInfo.workCenterId = data.workCenterId;
       },
 
       determineChoose(title, row) {
@@ -906,7 +911,7 @@
             this.form?.extInfo?.teamId &&
             typeof this.form?.extInfo?.teamId === 'string'
           ) {
-            this.userListFn(this.form.extInfo.teamId, 'init');
+            this.userListFn(this.form.extInfo, 'init');
           }
           if (res.taskList?.length) {
             this.form.taskNames = res.taskList.map((i) => i.name);

src/views/factoryModel/station/components/stationMeter.vue

@@ -192,6 +192,10 @@
     methods: {
       // 选择可执行工序
       handleProduce() {
+        if (!this.formData?.extInfo?.teamId) {
+          this.$message.error('请先选择班组');
+          return;
+        }
         this.$refs.produceRef.open(this.formData);
       },
       handParent(data, index) {

src/views/rulesManagement/recordrulesexecutemethod/index.vue

@@ -24,6 +24,7 @@
             :underline="false"
             icon="el-icon-edit"
             @click="openEdit('edit', row)"
+             v-if="!row.isUsing"
           >
             编辑
           </el-link>