Преглед изворни кода

张丁 作业票统计新增用户单位和用户主管等

zhangding пре 3 година
родитељ
комит
9d8dd942ec

+ 2 - 0
master/src/main/java/com/ruoyi/project/ehs/controller/TJobticketController.java

@@ -187,6 +187,8 @@ public class TJobticketController extends BaseController
             tJobticket.setGczyxkzh(tInvoiceWorkcontent.getGczyxkzh());
             tJobticket.setGczyjb(tInvoiceWorkcontent.getGczyjb());
             tJobticket.setDhzyxkzh(tInvoiceWorkcontent.getDhzyxkzh());
+            tJobticket.setUserMg(tInvoiceWorkcontent.getBookingworkticket().getUserMg());
+            tJobticket.setUserUnit(tInvoiceWorkcontent.getBookingworkticket().getUserUnit());
             tJobticket.setZypzt("10");
             tJobticketService.insertTJobticket(tJobticket);
             contentUserUnit.delete(0, contentUserUnit.length());

+ 12 - 2
ui/src/views/ehs/jobticket/index.vue

@@ -486,7 +486,7 @@
           <el-input v-model="postponeform.content" :placeholder="$t('请输入') + $t('内容')" />
         </el-form-item>
         <el-form-item label="用户单位" prop="userUnit">
-          <el-select v-model="postponeform.userUnit" placeholder="请选择用户单位" @change="checkCategoryPromotionUpdate(postponeform.userUnit)">
+          <el-select v-model="postponeform.userUnit" placeholder="请选择用户单位" @change="checkCategoryPromotionRenew(postponeform.userUnit)">
              <el-option
             v-for="dict in userUnitOptions"
             :key="dict.dictValue"
@@ -496,7 +496,7 @@
           </el-select>
         </el-form-item>
           <el-form-item label="用户主管" prop="userMg">
-          <el-select v-model="postponeform.userMg" placeholder="请先选择好用户单位">
+          <el-select v-model="postponeform.userMg" placeholder="请先选择好用户单位" @change="pick()">
              <el-option
               v-for="dict in userMgOptions"
             :key="dict.userId"
@@ -802,6 +802,16 @@ export default {
         //   let arr=  response.data.userIds.split(',');
       });
         },
+        checkCategoryPromotionRenew(oneId){
+         this.postponeform.userMg=null;
+         
+      getUserByUnit(oneId).then(response => {
+   //     this.form.userMg=null;
+        this.userMgOptions = response.data;
+        //   let arr=  response.data.userIds.split(',');
+      });
+        },
+        //主管下拉框变动
         pick(){
           this.$forceUpdate()
         },