工时修改

src/components/WorkHourManagement/index.vue

@@ -3,30 +3,52 @@
     <div class="head">
       <p>
         <span>{{ model.workName }}</span>
-        <span class="textRight"></span>
+        <span class="textRight">单价：<strong class="fontBold">{{ model.wage }}元</strong></span>
       </p>
     </div>
     <p>
       <span class="fl"></span>
-      <span class="fr"><span class="totalPrice">单次：<strong class="fontBold">{{model.wage}}元</strong></span></span>
+      <span class="fr"><strong class="fontBold">×{{ model.workHourNum2 }}{{ model.workUnit }}</strong>&emsp;&emsp;<span class="totalPrice">总价：<strong class="fontBold">{{model.workHourNum2 * model.wage}}元</strong></span></span>
     </p>
+    <!-- 弹窗 -->
+    <showModel
+      v-if="models.disjunctor"
+      :title="models.title"
+      :icon="models.icon"
+      :disjunctor="models.disjunctor"
+      @ok="ok"
+      @cancel="cancel"
+      @remove="remove"
+      :operate="models.operate"
+      selectName="gs_edit"
+      :data="gsData"
+    ></showModel>
   </div>
 </template>
 
 <script>
+import showModel from "../showModel/showModel.vue";
 export default {
   name: "WorkHourManagement",
   data() {
     return {
+      gsData: {},
       loadShow: true,
+      // 弹窗model
+      models: {
+        disjunctor: false
+      },
     };
   },
   props: ["model", "id", "summaryId", "incidentId", "summaryObj"],
+  components: {
+    showModel,
+  },
   methods: {
     // 移除
     remove(data) {
       console.log(data);
-      console.log(String(this.summaryObj.workHourManagementList.map(v => v.id).filter(v => v != this.id)))
+      return;
       const toast = this.$createToast({
         txt: "Loading...",
         mask: true
@@ -34,20 +56,82 @@ export default {
       toast.show();
       this.$http
         .post("service/bpm/data/addSummaryDoc", {
-            "workHourIds": String(this.summaryObj.workHourManagementList.map(v => v.id).filter(v => v != this.id)),
+            "workHourManagementList": [
+                {
+                    "workHourId": data.gs.id,
+                    "workHourNum": data.workHourNum
+                }
+            ],
             "summaryId": this.summaryId,
+            "remove": 'remove',
         })
         .then(res => {
           toast.hide();
+          this.models.disjunctor = false;
           if (res.data.status == 200) {
             this.$createDialog({
               type: "alert",
+              title: "操作成功",
               icon: "cubeic-right",
+              onConfirm: (e, promptValue) => {
+                this.loadShow = false;
+                this.$emit("refresh");
+              }
+            }).show();
+          } else {
+            this.$createDialog({
+              type: "alert",
+              title: "系统错误,请稍后再试!",
+              icon: "cubeic-wrong",
+              onConfirm: (e, promptValue) => {
+                this.loadShow = false;
+                this.$emit("refresh");
+              }
+            }).show();
+          }
+        });
+    },
+    //确定
+    ok(data) {
+      console.log(data);
+      const reg = /(^[1-9][0-9]*$)/;
+      if(!reg.test(data.workHourNum2)){
+          this.$createDialog({
+            type: "alert",
+            title: "请输入大于0的正整数!",
+            icon: "cubeic-warn"
+          }).show();
+          return;
+      }
+      const toast = this.$createToast({
+        txt: "Loading...",
+        mask: true
+      });
+      toast.show();
+      this.$http
+        .post("service/bpm/data/addSummaryDoc", {
+            "workHourManagementList": [
+                {
+                    "workHourId": data.gs.id,
+                    "workHourNum": data.workHourNum2,
+                    "workHourParent": data.gs.workHourParent
+                }
+            ],
+            "summaryId": this.summaryId,
+            "modifyNum": 'edit',
+        })
+        .then(res => {
+          toast.hide();
+          this.models.disjunctor = false;
+          if (res.data.status == 200) {
+            this.$createDialog({
+              type: "alert",
               title: "操作成功",
+              icon: "cubeic-right",
               onConfirm: (e, promptValue) => {
                 this.loadShow = false;
                 this.$emit("refresh");
-              },
+              }
             }).show();
           } else {
             this.$createDialog({
@@ -62,32 +146,102 @@ export default {
           }
         });
     },
+    //取消
+    cancel() {
+      this.models.disjunctor = false;
+    },
+    // 移除
+    // remove(data) {
+    //   console.log(data);
+    //   console.log(String(this.summaryObj.workHourManagementList.map(v => v.id).filter(v => v != this.id)))
+    //   const toast = this.$createToast({
+    //     txt: "Loading...",
+    //     mask: true
+    //   });
+    //   toast.show();
+    //   this.$http
+    //     .post("service/bpm/data/addSummaryDoc", {
+    //         "workHourIds": String(this.summaryObj.workHourManagementList.map(v => v.id).filter(v => v != this.id)),
+    //         "summaryId": this.summaryId,
+    //     })
+    //     .then(res => {
+    //       toast.hide();
+    //       if (res.data.status == 200) {
+    //         this.$createDialog({
+    //           type: "alert",
+    //           icon: "cubeic-right",
+    //           title: "操作成功",
+    //           onConfirm: (e, promptValue) => {
+    //             this.loadShow = false;
+    //             this.$emit("refresh");
+    //           },
+    //         }).show();
+    //       } else {
+    //         this.$createDialog({
+    //           type: "alert",
+    //           title: "系统错误,请稍后再试!",
+    //           icon: "cubeic-wrong",
+    //           onConfirm: (e, promptValue) => {
+    //             this.loadShow = false;
+    //             this.$emit("refresh");
+    //           }
+    //         }).show();
+    //       }
+    //     });
+    // },
     // 弹窗
-    showModal(item){
-      this.$createDialog({
-        type: "confirm",
-        title: "提示",
-        content: `您确认要移除工时【${item.workName}】吗`,
-        icon: "cubeic-right",
-        confirmBtn: {
-          text: "确定",
-          active: true,
-          disabled: false,
-          href: "javascript:;"
-        },
-        cancelBtn: {
-          text: "取消",
-          active: false,
-          disabled: false,
-          href: "javascript:;"
-        },
-        onConfirm: (e, promptValue) => {
-          this.loadShow = true;
-          this.remove(item);
+    showModal(item) {
+      console.log(item)
+      this.modelsData = item;
+      this.gsData = {
+        gs: {
+          wage: item.wage,
+          workName: item.workName,
+          workUnit: item.workUnit,
+          id: item.id,
+          workHourParent: item.parent?item.parent.id:undefined
         },
-        onCancel: () => {}
-      }).show();
-    }
+        incidentId: this.incidentId,
+        summaryId: this.summaryId,
+        workHourNum2: item.workHourNum2,
+      }
+      this.models = {
+        disjunctor: true,
+        title: "提示",
+        icon: "warn",
+        operate: {
+          ok: "确定",
+          cancel: "取消",
+          remove: '移除'
+        }
+      };
+    },
+    // 弹窗
+    // showModal(item){
+    //   this.$createDialog({
+    //     type: "confirm",
+    //     title: "提示",
+    //     content: `您确认要移除工时【${item.workName}${item.workUnit}】吗`,
+    //     icon: "cubeic-right",
+    //     confirmBtn: {
+    //       text: "确定",
+    //       active: true,
+    //       disabled: false,
+    //       href: "javascript:;"
+    //     },
+    //     cancelBtn: {
+    //       text: "取消",
+    //       active: false,
+    //       disabled: false,
+    //       href: "javascript:;"
+    //     },
+    //     onConfirm: (e, promptValue) => {
+    //       this.loadShow = true;
+    //       this.remove(item);
+    //     },
+    //     onCancel: () => {}
+    //   }).show();
+    // }
   },
   created() {
     console.log(this.model);

src/components/showModel/showModel.vue

@@ -67,6 +67,12 @@
           <div class="hc_item">单价：{{ data.hc.endPrice }}元</div>
           <div class="hc_item">使用数量：<cube-input type="number" style="flex:1" v-model="consumablesNum"></cube-input></div>
         </div>
+        <!-- 工时 -->
+        <div class="select-wrap hc" v-if="selectName === 'gs_edit'">
+          <div class="hc_item">工时名称：{{ data.gs.workName }}<span v-if="data.workUnit">{{ data.gs.workUnit }}</span></div>
+          <div class="hc_item">单价：{{ data.gs.wage }}元</div>
+          <div class="hc_item">使用数量：<cube-input type="number" style="flex:1" v-model="workHourNum2"></cube-input></div>
+        </div>
       </div>
       <div class="showModel__footer">
         <div v-if="operate.ok" class="showModel__ok" @click="ok">
@@ -98,6 +104,7 @@ export default {
   data() {
     return {
       consumablesNum: this.data ? (this.data.consumablesNum ? this.data.consumablesNum : 1) : 1,
+      workHourNum2: this.data ? (this.data.workHourNum2 ? this.data.workHourNum2 : 1) : 1,
       loginUser: JSON.parse(localStorage.getItem("loginUser")),
       logs: [],
       time: 5, //5秒后自动关闭
@@ -329,6 +336,8 @@ export default {
         this.$emit("ok", this.selectUserId);
       } else if (this.selectName === "hc_add" || this.selectName === "hc_edit") {
         this.$emit("ok", {hc: this.data.hc, consumablesNum:this.consumablesNum});
+      } else if (this.selectName === "gs_edit") {
+        this.$emit("ok", {gs: this.data.gs, workHourNum2:this.workHourNum2});
       } else if (this.textName === "textarea") {
         this.$emit("ok", this.textareaData);
       } else {
@@ -337,7 +346,11 @@ export default {
     },
     // 移除
     remove(){
-      this.$emit("remove", {hc: this.data.hc, consumablesNum:this.consumablesNum});
+      if(this.selectName === "hc_edit"){
+        this.$emit("remove", {hc: this.data.hc, consumablesNum:this.consumablesNum});
+      }else if(this.selectName === "gs_edit"){
+        this.$emit("remove", {gs: this.data.gs, workHourNum2:this.workHourNum2});
+      }
     },
     // 取消
     cancel() {

src/router/index.js

@@ -116,7 +116,7 @@ export default new Router({
       },
     },
     {
-      path: '/main/workHourManagementTwo/:incidentId/:summaryId/:parentId/:parentName/:processInstanceId',
+      path: '/main/workHourManagementTwo/:incidentId/:summaryId/:parentId/:parentName/:parentUnit/:processInstanceId',
       name: 'WorkHourManagementTwo',
       component: WorkHourManagementTwo,
       meta: {

src/views/WorkHourManagementOne.vue

@@ -16,7 +16,7 @@
               >
                 <div class="head">
                   <p>
-                    <span>{{ item.workName }}</span>
+                    <span>{{ item.workName }}<span v-if="item.workUnit">（{{ item.workUnit }}）</span></span>
                   </p>
                 </div>
               </div>
@@ -106,7 +106,7 @@ export default {
     // 弹窗
     toDetail(item) {
       this.$router.push({
-        path: `/main/WorkHourManagementTwo/${this.$route.params.incidentId}/${this.$route.params.summaryId}/${item.id}/${item.workName}/${this.$route.params.processInstanceId}`
+        path: `/main/WorkHourManagementTwo/${this.$route.params.incidentId}/${this.$route.params.summaryId}/${item.id}/${item.workName}/${item.workUnit}/${this.$route.params.processInstanceId}`
       });
     },
     // 获取列表

src/views/WorkHourManagementTwo.vue

@@ -2,7 +2,7 @@
   <div class="bgColor">
     <div slot="content" class="scroll-wrapper">
       <div class="demo">
-        <div class="header">一级目录选择的是：{{ $route.params.parentName }}</div>
+        <div class="header">一级目录选择的是：{{ $route.params.parentName }}<span v-if="$route.params.parentUnit!=='undefined'">{{ $route.params.parentUnit }}</span></div>
         <div class="scroll-list-wrap">
           <cube-scroll
             :data="items"
@@ -47,6 +47,7 @@ import LoadIng from "./loading.vue";
 export default {
   data() {
     return {
+      workHourManagementList:[],
       itemsCopy:[],
       checkList:[],
       hcData: {},
@@ -80,6 +81,12 @@ export default {
     // 确定
     subVali(){
       console.log(this.checkList);
+      console.log(this.workHourManagementList);
+      let workHourManagementMap = {};
+      this.workHourManagementList.forEach(v => {
+        workHourManagementMap[v.id] = v.workHourNum2;
+      })
+      console.log(workHourManagementMap);
       const toast = this.$createToast({
         txt: "Loading...",
         mask: true
@@ -87,7 +94,8 @@ export default {
       toast.show();
       this.$http
         .post("service/bpm/data/addSummaryDoc", {
-            "workHourIds": String(this.checkList),
+            "workHourParent":this.$route.params.parentId,
+            "workHourManagementList": this.checkList.map(v => ({workHourId: v, workHourNum: workHourManagementMap[v] || 1, workHourParent: this.$route.params.parentId})),
             "summaryId": this.$route.params.summaryId
         })
         .then(res => {
@@ -130,7 +138,7 @@ export default {
     // 弹窗
     toDetail(item) {
       this.$router.push({
-        path: `/main/WorkHourManagementTwo/${this.$route.params.incidentId}/${this.summaryId}/${item.id}/${this.$route.params.processInstanceId}`
+        path: `/main/WorkHourManagementTwo/${this.$route.params.incidentId}/${this.summaryId}/${item.id}/${item.workName}/${item.workUnit}/${this.$route.params.processInstanceId}`
       });
     },
     // 获取列表
@@ -145,8 +153,8 @@ export default {
         )
         .then((res) => {
           if(res.data.status == 200){
-            let workHourManagementList = res.data.workHourManagementList || [];
-            this.checkList = workHourManagementList.map(v => v.id);
+            this.workHourManagementList = res.data.workHourManagementList || [];
+            this.checkList = this.workHourManagementList.map(v => v.id);
             console.log(this.checkList)
             // ###########################
             let postData = {
@@ -167,10 +175,10 @@ export default {
                     this.wushuju = false;
                     if (this.searching) {
                       this.items = res.data.list;
-                      this.itemsCopy = res.data.list.map(v => ({label:v.workName, value: v.id}));
+                      this.itemsCopy = res.data.list.map(v => ({label:v.workName + (v.workUnit?'（'+v.workUnit+'）':''), value: v.id}));
                     } else {
                       this.items = this.items.concat(res.data.list);
-                      this.itemsCopy = this.itemsCopy.concat(res.data.list.map(v => ({label:v.workName, value: v.id})));
+                      this.itemsCopy = this.itemsCopy.concat(res.data.list.map(v => ({label:v.workName + (v.workUnit?'（'+v.workUnit+'）':''), value: v.id})));
                     }
                   } else {
                     this.wushuju = true;

src/views/summaryOrder.vue

@@ -43,7 +43,7 @@
             <span class="dash dash-jia"></span>
           </p>
           <p class="textCenter total">
-            <span>汇总单总价：<strong class="fontBold">{{ totalPriceConsumable + totalPriceWorkHourManagement }}元</strong></span>
+            <span>汇总单总价：<strong class="fontBold">{{ totalMaintenancePrice }}元</strong></span>
           </p>
         </div>
       </div>
@@ -71,8 +71,9 @@ export default {
   data() {
     return {
       // 耗材总价格
-      totalPriceConsumable: 0,
-      totalPriceWorkHourManagement: 0,
+      totalMaintenancePrice: null,
+      totalPriceConsumable: null,
+      totalPriceWorkHourManagement: null,
       summaryObj: {},
       loginUser: JSON.parse(localStorage.getItem("loginUser")),
       id: "",
@@ -175,16 +176,10 @@ export default {
         toast.hide();
         if(res.data.status == 200){
           this.summaryObj = res.data;
-          if(this.summaryObj.consumableList){
-            this.totalPriceConsumable = this.summaryObj.consumableList.reduce((pre, current) => pre + current.consumableEndPrice * current.consumablesNum, 0)
-          }else{
-            this.totalPriceConsumable = 0;
-          }
-          if(this.summaryObj.workHourManagementList){
-            this.totalPriceWorkHourManagement = this.summaryObj.workHourManagementList.reduce((pre, current) => pre + current.wage, 0)
-          }else{
-            this.totalPriceWorkHourManagement = 0;
-          }
+          this.totalMaintenancePrice = this.summaryObj.totalMaintenancePrice;
+          this.totalMaintenancePrice = this.summaryObj.totalMaintenancePrice;
+          this.totalPriceConsumable = this.summaryObj.consumablePrice;
+          this.totalPriceWorkHourManagement = this.summaryObj.workHourPrice;
           this.summaryId = res.data.summaryId;
         }else if(res.data.status == 201){
           // 事件第一次绑定汇总单

src/views/summaryOrderDetail.vue

@@ -23,7 +23,7 @@
             <span>工时总价：<strong class="fontBold">{{ totalPriceWorkHourManagement }}元</strong></span>
           </p>
           <p class="textCenter total">
-            <span>汇总单总价：<strong class="fontBold">{{ totalPriceConsumable + totalPriceWorkHourManagement }}元</strong></span>
+            <span>汇总单总价：<strong class="fontBold">{{ totalMaintenancePrice }}元</strong></span>
           </p>
         </div>
       </div>
@@ -50,8 +50,9 @@ export default {
   data() {
     return {
       // 耗材总价格
-      totalPriceConsumable: 0,
-      totalPriceWorkHourManagement: 0,
+      totalMaintenancePrice: null,
+      totalPriceConsumable: null,
+      totalPriceWorkHourManagement: null,
       summaryObj: {},
       loginUser: JSON.parse(localStorage.getItem("loginUser")),
       id: "",
@@ -113,16 +114,10 @@ export default {
         toast.hide();
         if(res.data.status == 200){
           this.summaryObj = res.data;
-          if(this.summaryObj.consumableList){
-            this.totalPriceConsumable = this.summaryObj.consumableList.reduce((pre, current) => pre + current.consumableEndPrice * current.consumablesNum, 0)
-          }else{
-            this.totalPriceConsumable = 0;
-          }
-          if(this.summaryObj.workHourManagementList){
-            this.totalPriceWorkHourManagement = this.summaryObj.workHourManagementList.reduce((pre, current) => pre + current.wage, 0)
-          }else{
-            this.totalPriceWorkHourManagement = 0;
-          }
+          this.totalMaintenancePrice = this.summaryObj.totalMaintenancePrice;
+          this.totalPriceConsumable = this.summaryObj.consumablePrice;
+          this.totalPriceWorkHourManagement = this.summaryObj.workHourPrice;
+
           this.summaryId = res.data.summaryId;
         }else if(res.data.status == 201){
           // 事件第一次绑定汇总单