2024.1.22 单位、单价 协同人员

src/views/modules/eam/eamWorkOrderForMaintenance.vue

@@ -1515,7 +1515,7 @@
       getRoleNameList () {
         this.dataListLoading = true
         this.$http({
-          url: this.$http.adornUrl('/sys/role/list'),
+          url: this.$http.adornUrl('/sys/role/list2'),
           method: 'get',
           params: this.$http.adornParams({
             'page': this.pageIndex,

src/views/modules/eam/eamWorkPlanForCheck.vue

@@ -1904,7 +1904,7 @@
       getRoleNameList () {
         this.dataListLoading = true
         this.$http({
-          url: this.$http.adornUrl('/sys/role/list'),
+          url: this.$http.adornUrl('/sys/role/list2'),
           method: 'get',
           params: this.$http.adornParams({
             'page': this.pageIndex,

src/views/modules/eam/eamWorkPlanForMaintenance.vue

@@ -1792,7 +1792,7 @@
       getRoleNameList () {
         this.dataListLoading = true
         this.$http({
-          url: this.$http.adornUrl('/sys/role/list'),
+          url: this.$http.adornUrl('/sys/role/list2'),
           method: 'get',
           params: this.$http.adornParams({
             'page': this.pageIndex,

src/views/modules/partspare/partspare-add-or-update.vue

@@ -22,10 +22,10 @@
         <el-form-item required label="产品组编码">
           <el-input v-model="dataForm.groupId"></el-input>
         </el-form-item>
-        <el-form-item required label="计价单位">
+        <el-form-item required label="单价">
           <el-input v-model="dataForm.averagePrice"></el-input>
         </el-form-item>
-        <el-form-item required label="单价单位">
+        <el-form-item required label="单位">
           <el-input v-model="dataForm.umid"></el-input>
         </el-form-item>
         <el-form-item required label="预计使用寿命">
@@ -192,15 +192,15 @@ export default {
         return;
       }
       if (!this.dataForm.averagePrice) {
-        this.$message.warning("计价单位不能为空")
+        this.$message.warning("单价不能为空")
         return;
       }
       if (isNaN(this.dataForm.averagePrice)) {
-        this.$message.warning("计价单位必须为整数或小数!")
+        this.$message.warning("单价必须为整数或小数!")
         return;
       }
       if (!this.dataForm.umid) {
-        this.$message.warning("单价单位不能为空")
+        this.$message.warning("单位不能为空")
         return;
       }
       if (!this.dataForm.estUseQty) {

src/views/modules/partspare/partspare.vue

@@ -252,8 +252,6 @@ export default {
           fixed: '',
           columnWidth: 140,
         },
-
-
         {
           userId: this.$store.state.user.name,
           functionId: this.$route.meta.menuId,
@@ -263,7 +261,7 @@ export default {
           columnProp: 'umid',
           headerAlign: "center",
           align: "left",
-          columnLabel: '单价单位',
+          columnLabel: '单位',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -272,7 +270,6 @@ export default {
           fixed: '',
           columnWidth: 140,
         },
-
         {
           userId: this.$store.state.user.name,
           functionId: this.$route.meta.menuId,

src/views/modules/qc/qcPartAttribute.vue

@@ -1297,6 +1297,7 @@
         userBuList: [],
         partInfoList: [],
         partDetailData: {
+          buNo: '',
           partNo: '',
           partDesc: '',
           seqNo: '',
@@ -1340,6 +1341,7 @@
       },
 
       searchPartInfo () {
+        this.partDetailData.buNo = this.modalData.bu
         if (!this.partDetailData.partNo && !this.partDetailData.partDesc && !this.partDetailData.sku && !this.partDetailData.cinvSourceCode) {
           this.partInfoList = []
           this.partDisableFlag = true

src/views/modules/reportWorkOrder/reportDefectOrder.vue

@@ -1105,7 +1105,7 @@
       getRoleNameList () {
         this.dataListLoading = true
         this.$http({
-          url: this.$http.adornUrl('/sys/role/list'),
+          url: this.$http.adornUrl('/sys/role/list2'),
           method: 'get',
           params: this.$http.adornParams({
             'page': this.pageIndex,

src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue

@@ -1306,7 +1306,7 @@
       getRoleNameList () {
         this.dataListLoading = true
         this.$http({
-          url: this.$http.adornUrl('/sys/role/list'),
+          url: this.$http.adornUrl('/sys/role/list2'),
           method: 'get',
           params: this.$http.adornParams({
             'page': this.pageIndex,