班组管理问题修改 12.14

ant-design-vue-jeecg/src/views/team/GroupxList.vue

@@ -140,11 +140,11 @@ export default {
             return parseInt(index) + 1;
           }
         },
-        {
+        // {
-          title: '部门编号',
+        //   title: '部门编号',
-          align: "center",
+        //   align: "center",
-          dataIndex: 'departId'
+        //   dataIndex: 'departId'
-        },
+        // },
         {
           title: '部门名称',
           align: "center",

ant-design-vue-jeecg/src/views/team/StationList.vue

@@ -79,9 +79,10 @@
         :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         @change="handleTableChange">
         <span slot="action1" slot-scope="text, record">
-           <a @click="jumpPage1(record)">工位设备管理</a>
+           <a @click="jumpPage1(record)">管理</a>
-           <a-divider type="vertical"/>
+        </span>
-           <a @click="jumpPage2(record)">工位工具管理</a>
+        <span slot="action2" slot-scope="text, record">
+           <a @click="jumpPage2(record)">管理</a>
         </span>
         <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
@@ -155,13 +156,21 @@ export default {
           dataIndex: 'description'
         },
         {
-          title: '管理模块',
+          title: '工位设备模块',
           dataIndex: 'action1',
           align: "center",
           // fixed: "right",
           width: 80,
           scopedSlots: {customRender: 'action1'}
         },
+        {
+          title: '工位工具模块',
+          dataIndex: 'action2',
+          align: "center",
+          // fixed: "right",
+          width: 80,
+          scopedSlots: {customRender: 'action2'}
+        },
         {
           title: '操作',
           dataIndex: 'action',
@@ -193,6 +202,7 @@ export default {
         query: {  // 路由携带参数
           'stationId': record.id,
           'stationName': record.stationName,
+          'stationNum': record.stationNum,
         },
       });
     },
@@ -202,6 +212,7 @@ export default {
         query: {  // 路由携带参数
           'stationId': record.id,
           'stationName': record.stationName,
+          'stationNum': record.stationNum,
         },
       });
     },

ant-design-vue-jeecg/src/views/team/StationMachineList.vue

@@ -131,20 +131,30 @@ export default {
             return parseInt(index) + 1;
           }
         },
+        // {
+        //   title: '工位ID',
+        //   align: "center",
+        //   dataIndex: 'stationId'
+        // },
         {
-          title: '工位ID',
+          title: '工位序号',
           align: "center",
-          dataIndex: 'stationId'
+          dataIndex: 'stationNum'
         },
         {
           title: '工位名称',
           align: "center",
           dataIndex: 'stationName',
         },
+        // {
+        //   title: '设备ID',
+        //   align: "center",
+        //   dataIndex: 'machineId'
+        // },
         {
-          title: '设备ID',
+          title: '设备名称',
           align: "center",
-          dataIndex: 'machineId'
+          dataIndex: 'machineId_dictText'
         },
         {
           title: '操作',
@@ -164,6 +174,7 @@ export default {
       loadRouteType: false,
       stationId: "",
       stationName: "",
+      stationNum: "",
       dictOptions: {},
       // superFieldList: [],
     }
@@ -193,6 +204,7 @@ export default {
       if (this.loadRouteType === false) {
         this.stationId = this.$route.query.stationId;
         this.stationName = this.$route.query.stationName;
+        this.stationNum = this.$route.query.stationNum;
         // this.biaoTi = this.$route.query.styleNames+"款式面料管理";
         // console.log("*******传递的stationId:" + this.stationId)
         this.loadRouteType = true;
@@ -225,6 +237,7 @@ export default {
       }).finally(() => {
         this.dataSource.forEach(item => {
           item['stationName'] = this.stationName;
+          item['stationNum'] = this.stationNum;
         })
         this.loading = false
       })

ant-design-vue-jeecg/src/views/team/StationToolList.vue

@@ -129,20 +129,30 @@ export default {
             return parseInt(index) + 1;
           }
         },
+        // {
+        //   title: '工位ID',
+        //   align: "center",
+        //   dataIndex: 'stationId'
+        // },
         {
-          title: '工位ID',
+          title: '工位序号',
           align: "center",
-          dataIndex: 'stationId'
+          dataIndex: 'stationNum'
         },
         {
           title: '工位名称',
           align: "center",
           dataIndex: 'stationName',
         },
+        // {
+        //   title: '工具ID',
+        //   align: "center",
+        //   dataIndex: 'toolsId'
+        // },
         {
-          title: '工具ID',
+          title: '工具名称',
           align: "center",
-          dataIndex: 'toolsId'
+          dataIndex: 'toolsId_dictText'
         },
         {
           title: '操作',
@@ -162,6 +172,7 @@ export default {
       loadRouteType: false,
       stationId: "",
       stationName: "",
+      stationNum: "",
       dictOptions: {},
       // superFieldList: [],
     }
@@ -191,6 +202,7 @@ export default {
       if (this.loadRouteType === false) {
         this.stationId = this.$route.query.stationId;
         this.stationName = this.$route.query.stationName;
+        this.stationNum = this.$route.query.stationNum;
         // this.biaoTi = this.$route.query.styleNames+"款式面料管理";
         // console.log("*******传递的stationId:" + this.stationId)
         this.loadRouteType = true;
@@ -223,6 +235,7 @@ export default {
       }).finally(() => {
         this.dataSource.forEach(item => {
           item['stationName'] = this.stationName;
+          item['stationNum'] = this.stationNum;
         })
         this.loading = false
       })

ant-design-vue-jeecg/src/views/team/modules/GroupxModal.vue

@@ -14,14 +14,16 @@
 
         <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="departId" label="部门">
           <!--          <a-input placeholder="请输入部门编号" v-model="model.departId"/>-->
-          <j-select-depart placeholder="请选择部门" v-model="model.departId"/>
+<!--          <j-select-depart placeholder="请选择部门" v-model="model.departId"/>-->
+          <j-dict-select-tag type="list"  v-model="model.departId" dictCode="sys_depart,depart_name,id,org_type='1'" placeholder="请选择部门" />
+
         </a-form-model-item>
         <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="groupName" label="班组名称">
           <a-input placeholder="请输入班组名称" v-model="model.groupName"/>
         </a-form-model-item>
         <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="enterprisesManager" label="负责人">
           <!--          <a-input placeholder="请输入负责人" v-model="model.enterprisesManager"/>-->
-          <j-select-multi-user placeholder="请选择负责人" v-model="model.enterprisesManager" @change="getMobile()"/>
+          <j-select-multi-user placeholder="请选择负责人" v-model="model.enterprisesManager" @change="getQuestionBankList()"/>
         </a-form-model-item>
         <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="mobile" label="手机号">
           <a-input placeholder="请输入手机号" v-model="model.mobile"/>
@@ -87,29 +89,42 @@ export default {
   created() {
   },
   methods: {
-    getMobile() {
+    async getQuestionBankList() {
-      alert(this.model.enterprisesManager);
-      this.mobileVal = "sys_user,phone,username,username='" + this.model.enterprisesManager + "'";
-      // this.model.mobile = "123456789";
-
       let param = {
         "username": this.model.enterprisesManager,
       }
       let that = this;
-      getAction(this.url.sysUserList, param).then((res) => {
+      const {data: res} = await this.$axios.get('/jeecg-boot/sys/user/list', {params: param})
-        if (res.success) {
+      // this.questionBankList = res.result
-          console.log("res:" + JSON.stringify(res.result.records[0]))
+      console.log("userlist:"+JSON.stringify(res))
-          console.log("res22222222:" + JSON.stringify(res.result.records[0].phone));
+      console.log("the phone:"+JSON.stringify(res.result.records[0].phone))
-          // this.model.mobile = res.result.records[0].phone;
+      let phone = JSON.stringify(res.result.records[0].phone);
-          // this.model.mobile = JSON.stringify(res.result.records[0].phone)
+      that.model.mobile = phone;
-          if (JSON.stringify(res.result.records[0].phone)!=="") {
-            that.model.mobile = "15112345678";
-          } else {
-            that.model.mobile = JSON.stringify(res.result.records[0].phone)
-          }
-        }
-      });
     },
+
+    // getMobile() {
+    //   alert(this.model.enterprisesManager);
+    //   this.mobileVal = "sys_user,phone,username,username='" + this.model.enterprisesManager + "'";
+    //   // this.model.mobile = "123456789";
+    //
+    //   let param = {
+    //     "username": this.model.enterprisesManager,
+    //   }
+    //   let that = this;
+    //   getAction(this.url.sysUserList, param).then((res) => {
+    //     if (res.success) {
+    //       console.log("res:" + JSON.stringify(res.result.records[0]))
+    //       console.log("res22222222:" + JSON.stringify(res.result.records[0].phone));
+    //       // this.model.mobile = res.result.records[0].phone;
+    //       // this.model.mobile = JSON.stringify(res.result.records[0].phone)
+    //       if (JSON.stringify(res.result.records[0].phone) !== "") {
+    //         that.model.mobile = "15112345678";
+    //       } else {
+    //         that.model.mobile = JSON.stringify(res.result.records[0].phone)
+    //       }
+    //     }
+    //   });
+    // },
     add() {
       //初始化默认值
       this.edit({});

ant-design-vue-jeecg/src/views/team/modules/StationModal.vue

@@ -18,7 +18,8 @@
 <!--        </a-form-model-item>-->
         <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="departId" label="车间">
           <!--          <a-input placeholder="请输入部门编号" v-model="model.departId"/>-->
-          <j-select-depart placeholder="请选择车间" v-model="model.departId"/>
+<!--          <j-select-depart placeholder="请选择车间" v-model="model.departId"/>-->
+          <j-dict-select-tag type="list"  v-model="model.departId" dictCode="sys_depart,depart_name,id,org_type='1'" placeholder="请选择车间" />
         </a-form-model-item>
         <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="stationName" label="工位名称">
           <a-input placeholder="请输入工位名称" v-model="model.stationName"/>

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/entity/StationMachine.java

@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -44,6 +45,7 @@ public class StationMachine {
      */
     @Excel(name = "设备id，uuid，FK，设备表", width = 15)
     @ApiModelProperty(value = "设备id，uuid，FK，设备表")
+    @Dict(dictTable = "zy_devicetype", dicText = "name", dicCode = "id")
     private String machineId;
     /**
      * 创建日期

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/entity/StationTool.java

@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -44,6 +45,7 @@ public class StationTool {
      */
     @Excel(name = "工具id，uuid，FK，工具表", width = 15)
     @ApiModelProperty(value = "工具id，uuid，FK，工具表")
+    @Dict(dictTable = "zy_tool", dicText = "name", dicCode = "id")
     private String toolsId;
     /**
      * 创建日期