Merge branch 'master' of http://git.mes123.com/zhouyx/mes-ui

assets/css/base.less

@@ -403,10 +403,31 @@ div::-webkit-scrollbar-corner {
 .pt15 {
   padding-top: 15px
 }
+.pr10 {
+  padding-right: 10px;
+}
+.pr20 {
+  padding-right: 20px;
+}
 
 .pr30 {
   padding-right: 30px;
 }
+.pr50 {
+  padding-right: 50px;
+}
+.pr80 {
+  padding-right: 80px;
+}
+.pr100 {
+  padding-right: 100px;
+}
+.pr200 {
+  padding-right: 200px;
+}
+.pr240 {
+  padding-right: 240px;
+}
 
 .bnone {
   border: none;
@@ -996,10 +1017,9 @@ textarea::-webkit-input-placeholder {
   display:block;
   line-height:30px;
   padding:5px 10px;
-  background:#f5f6fa;
-  border-bottom:solid 1px #ccc;
-  border-left:solid 1px #ccc;
-  border-right:solid 1px #ccc
+  border-bottom: #ccc solid 1px;
+  border-right: #ccc solid 1px;
+  border-left: #ccc solid 1px;
 }
 .cellInfoTitle {
   padding: 0 10px;

components/page/productTree.vue

 <template>
-  <div class="flex fd tree-menu">
+<div class="flex fd tree-menu">
     <h3>
         产品结构
         <div class="fr mr10 mt10">
             <ButtonGroup class="fr" size="small">
-          <Button
-            :icon="expand ? 'md-arrow-dropright' : 'md-arrow-dropdown'"
-            @click="toggle"
-            title="展开/合并"
-          ></Button>
+                <Button :icon="expand ? 'md-arrow-dropright' : 'md-arrow-dropdown'" @click="toggle" title="展开/合并"></Button>
                 <Button icon="md-refresh" title="刷新" @click="loadTree"></Button>
                 <Button icon="md-rewind" title="收起" @click="hide"></Button>
             </ButtonGroup>
@@ -22,7 +18,7 @@
             <Tree :data="data" :render="renderContent" ref="tree" @on-select-change="change"></Tree>
         </div>
     </div>
-  </div>
+</div>
 </template>
 
 <script>
@@ -44,11 +40,12 @@ export default {
                 .get(`${technologyUrl}productlevel/getproducttreenew`)
                 .then(r => {
                     setTree(r.result);
+
                     function setTree(data) {
                         data.map(u => {
                             u.title = u.name;
                             u.value = u.id;
-              //   u.expand = true;
+                            u.expand = true;
                             //   u.selected = false;
                             //   u.checked = false;
                             if (u.children) {
@@ -63,7 +60,11 @@ export default {
         toggle() {
             this.expand = !this.expand;
         },
-    renderContent(h, { root, node, data }) {
+        renderContent(h, {
+            root,
+            node,
+            data
+        }) {
             let type = "md-folder";
             if (data.isProduct != 0) {
                 type = "ios-image";
@@ -78,8 +79,7 @@ export default {
                     }
                 }),
                 h(
-          "span",
-          {
+                    "span", {
                         style: {
                             color: data.isProduct == 0 ? "#000" : "rgba(38, 128, 235, 1)"
                         }
@@ -98,6 +98,7 @@ export default {
             productIds.push(b.value);
             if (b.children) {
                 addId(b.children);
+
                 function addId(data) {
                     data.map(u => {
                         if (u.bomId !== 0) {
@@ -122,6 +123,7 @@ export default {
             let expand = this.expand;
             let result = [];
             search(this.keys, items);
+
             function search(keys, data) {
                 data.map(u => {
                     if (keys.length < 2) {
@@ -145,6 +147,7 @@ export default {
 
 <style lang="less">
 @import "../../assets/css/custom.less";
+
 .tree-menu {
     h3 {
         height: 50px;
@@ -157,16 +160,19 @@ export default {
         opacity: 1;
         padding-left: 10px;
     }
+
     .search {
         height: 50px;
         padding: 5px 10px;
     }
+
     .fg {
         flex: none;
         // height:0;
         overflow: auto;
         padding-left: 10px;
     }
+
     .tree {
         height: calc(100vh - 215px);
         overflow: auto;

pages/handle/examine1/index.vue

@@ -266,6 +266,7 @@ export default {
                 if (r.success) {
                     this.$Message.success('审批通过成功')
                     this.footerStatu = 3
+                    this.$refs.userProcess.load(this.detailId)
                 } else {
                     this.$Message.error('审批通过失败')
                 }
@@ -282,6 +283,7 @@ export default {
             Api.reject(param).then((r) => {
                 if (r.success) {
                     this.$Message.success('驳回审批成功')
+                    this.$refs.userProcess.load(this.detailId)
                     this.footerStatu = 3
                 } else {
                     this.$Message.error('加载失败')
@@ -298,6 +300,7 @@ export default {
             Api.terminate(param).then((r) => {
                 if (r.success) {
                     this.$Message.success('终止审批成功')
+                    this.$refs.userProcess.load(this.detailId)
                     this.footerStatu = 3
                 } else {
                     this.$Message.error('加载失败')

pages/handle/examine10/index.vue

 <template>
-  <div style="padding:30px 0">
+<div style="padding:30px 0">
     <Detail :idVal="detailId" />
     <Process ref="userProcess" :idVal="detailId" :resulstInfo="testObj" />
     <div class="footers" v-if="footerStatu === '2'" style="text-align:left;">
@@ -14,39 +14,19 @@
                     </RadioGroup>
                 </FormItem>
                 <FormItem label="驳回节点：" v-if="formMyCheck.radioSp === '驳回'" prop="rejectToNodeId">
-              <Select
-                style="width:200px"
-                clearable
-                transfer
-                placeholder="请选择驳回节点"
-                v-model="formMyCheck.rejectToNodeId"
-              >
+                    <Select style="width:200px" clearable transfer placeholder="请选择驳回节点" v-model="formMyCheck.rejectToNodeId">
                         <Option value class="option-text">请选择驳回节点</Option>
-                <Option
-                  v-for="(item, index) in nodeList"
-                  :value="item.value"
-                  :label="item.label"
-                  :key="index"
-                  :disabled="item.statu > 0 ? false : true"
-                ></Option>
+                        <Option v-for="(item, index) in nodeList" :value="item.value" :label="item.label" :key="index" :disabled="item.statu > 0 ? false : true"></Option>
                     </Select>
                     <RadioGroup type="button" size="small" @on-change="changeToNode">
                         <Radio label="1">上一节点</Radio>
                         <Radio label="2">第一节点</Radio>
                     </RadioGroup>
                 </FormItem>
-            <FormItem
-              label="原因："
-              v-if="
+                <FormItem label="原因：" v-if="
                 formMyCheck.radioSp === '驳回' || formMyCheck.radioSp === '终止'
-              "
-              prop="comment"
-            >
-              <Input
-                v-model="formMyCheck.comment"
-                style="width:400px;margin-left:10px"
-                placeholder="请输入原因"
-              />
+              " prop="comment">
+                    <Input v-model="formMyCheck.comment" style="width:400px;margin-left:10px" placeholder="请输入原因" />
                 </FormItem>
                 </Col>
                 <Col span="6" style="text-align:right;padding-right:40px">
@@ -68,8 +48,9 @@
             <Button type="primary" @click="checkFalse">确定</Button>
         </div>
     </Modal>
-  </div>
+</div>
 </template>
+
 <script>
 import Api from '../api'
 import Detail from './detail'
@@ -111,30 +92,29 @@ export default {
             nextNodeUserIdList: [], //通过时提交的下一个节点UserId
             testObj: {},
             ruleValidate: {
-        rejectToNodeId: [
-          {
+                rejectToNodeId: [{
                     required: true,
                     message: '请选择驳回节点',
                     type: 'number',
                     trigger: 'change'
-          }
-        ],
-        comment: [
-          {
+                }],
+                comment: [{
                     required: true,
                     message: '请输入原因',
                     trigger: 'blur'
-          }
-        ]
+                }]
             }
         }
     },
     props: {},
-  async fetch({ store, params }) {
+    async fetch({
+        store,
+        params
+    }) {
         await store.dispatch('loadDictionary') // 加载数据字典
     },
     created() {
-    this.currentUserId=this.$store.state.userInfo.userId
+        this.currentUserId = this.$store.state.userInfo.userId
         this.detailId = this.$http.common.getquerystring('id')
         this.footerStatu = this.$http.common.getquerystring('statu')
         this.getDetailInfos(this.detailId)
@@ -148,16 +128,14 @@ export default {
                     if (valid) {
                         this.modalCheckNo = true
                         this.statuTitle = '驳回'
-          } else {
-          }
+                    } else {}
                 })
             } else {
                 this.$refs['formValidate'].validate((valid) => {
                     if (valid) {
                         this.modalCheckNo = true
                         this.statuTitle = '终止'
-          } else {
-          }
+                    } else {}
                 })
             }
         },
@@ -170,8 +148,8 @@ export default {
                 this.testObj = r
                 if (r.success) {
                     this.currentNodeID = r.result.currentNodeId
-          this.passId=r.result.currentRecordId
-          this.nextNodeUserIdList=this.$refs.userProcess.immutData//获取下一节点的审核人
+                    this.passId = r.result.currentRecordId
+                    this.nextNodeUserIdList = this.$refs.userProcess.immutData //获取下一节点的审核人
                     this.getNodes(r.result.nodes)
                 } else {
                     this.$Message.error('加载失败')
@@ -220,6 +198,7 @@ export default {
             Api.pass(param).then((r) => {
                 if (r.success) {
                     this.$Message.success('审批通过成功')
+                    this.$refs.userProcess.load(this.detailId)
                     this.modalCheckNo = false
                 } else {
                     this.$Message.error('审批通过失败')
@@ -239,6 +218,7 @@ export default {
             Api.reject(param).then((r) => {
                 if (r.success) {
                     this.$Message.success('驳回审批成功')
+                    this.$refs.userProcess.load(this.detailId)
                     this.modalCheckNo = false
                 } else {
                     this.$Message.error('加载失败')
@@ -257,6 +237,7 @@ export default {
             Api.terminate(param).then((r) => {
                 if (r.success) {
                     this.$Message.success('终止审批成功')
+                    this.$refs.userProcess.load(this.detailId)
                     this.modalCheckNo = false
                 } else {
                     this.$Message.error('加载失败')

pages/handle/examine11/index.vue

 <template>
-  <div style="padding:30px 0">
+<div style="padding:30px 0">
     <Detail :idVal="detailId" />
     <Process ref="userProcess" :idVal="detailId" :resulstInfo="testObj" />
     <div class="footers" v-if="footerStatu === '2'" style="text-align:left;">
@@ -14,39 +14,19 @@
                     </RadioGroup>
                 </FormItem>
                 <FormItem label="驳回节点：" v-if="formMyCheck.radioSp === '驳回'" prop="rejectToNodeId">
-              <Select
-                style="width:200px"
-                clearable
-                transfer
-                placeholder="请选择驳回节点"
-                v-model="formMyCheck.rejectToNodeId"
-              >
+                    <Select style="width:200px" clearable transfer placeholder="请选择驳回节点" v-model="formMyCheck.rejectToNodeId">
                         <Option value class="option-text">请选择驳回节点</Option>
-                <Option
-                  v-for="(item, index) in nodeList"
-                  :value="item.value"
-                  :label="item.label"
-                  :key="index"
-                  :disabled="item.statu > 0 ? false : true"
-                ></Option>
+                        <Option v-for="(item, index) in nodeList" :value="item.value" :label="item.label" :key="index" :disabled="item.statu > 0 ? false : true"></Option>
                     </Select>
                     <RadioGroup type="button" size="small" @on-change="changeToNode">
                         <Radio label="1">上一节点</Radio>
                         <Radio label="2">第一节点</Radio>
                     </RadioGroup>
                 </FormItem>
-            <FormItem
-              label="原因："
-              v-if="
+                <FormItem label="原因：" v-if="
                 formMyCheck.radioSp === '驳回' || formMyCheck.radioSp === '终止'
-              "
-              prop="comment"
-            >
-              <Input
-                v-model="formMyCheck.comment"
-                style="width:400px;margin-left:10px"
-                placeholder="请输入原因"
-              />
+              " prop="comment">
+                    <Input v-model="formMyCheck.comment" style="width:400px;margin-left:10px" placeholder="请输入原因" />
                 </FormItem>
                 </Col>
                 <Col span="6" style="text-align:right;padding-right:40px">
@@ -68,8 +48,9 @@
             <Button type="primary" @click="checkFalse">确定</Button>
         </div>
     </Modal>
-  </div>
+</div>
 </template>
+
 <script>
 import Api from '../api'
 import Detail from './detail'
@@ -111,30 +92,29 @@ export default {
             nextNodeUserIdList: [], //通过时提交的下一个节点UserId
             testObj: {},
             ruleValidate: {
-        rejectToNodeId: [
-          {
+                rejectToNodeId: [{
                     required: true,
                     message: '请选择驳回节点',
                     type: 'number',
                     trigger: 'change'
-          }
-        ],
-        comment: [
-          {
+                }],
+                comment: [{
                     required: true,
                     message: '请输入原因',
                     trigger: 'blur'
-          }
-        ]
+                }]
             }
         }
     },
     props: {},
-  async fetch({ store, params }) {
+    async fetch({
+        store,
+        params
+    }) {
         await store.dispatch('loadDictionary') // 加载数据字典
     },
     created() {
-    this.currentUserId=this.$store.state.userInfo.userId
+        this.currentUserId = this.$store.state.userInfo.userId
         this.detailId = this.$http.common.getquerystring('id')
         this.footerStatu = this.$http.common.getquerystring('statu')
         this.getDetailInfos(this.detailId)
@@ -148,16 +128,14 @@ export default {
                     if (valid) {
                         this.modalCheckNo = true
                         this.statuTitle = '驳回'
-          } else {
-          }
+                    } else {}
                 })
             } else {
                 this.$refs['formValidate'].validate((valid) => {
                     if (valid) {
                         this.modalCheckNo = true
                         this.statuTitle = '终止'
-          } else {
-          }
+                    } else {}
                 })
             }
         },
@@ -170,8 +148,8 @@ export default {
                 this.testObj = r
                 if (r.success) {
                     this.currentNodeID = r.result.currentNodeId
-          this.passId=r.result.currentRecordId
-          this.nextNodeUserIdList=this.$refs.userProcess.immutData//获取下一节点的审核人
+                    this.passId = r.result.currentRecordId
+                    this.nextNodeUserIdList = this.$refs.userProcess.immutData //获取下一节点的审核人
                     this.getNodes(r.result.nodes)
                 } else {
                     this.$Message.error('加载失败')
@@ -220,6 +198,7 @@ export default {
             Api.pass(param).then((r) => {
                 if (r.success) {
                     this.$Message.success('审批通过成功')
+                    this.$refs.userProcess.load(this.detailId)
                     this.modalCheckNo = false
                 } else {
                     this.$Message.error('审批通过失败')
@@ -239,6 +218,7 @@ export default {
             Api.reject(param).then((r) => {
                 if (r.success) {
                     this.$Message.success('驳回审批成功')
+                    this.$refs.userProcess.load(this.detailId)
                     this.modalCheckNo = false
                 } else {
                     this.$Message.error('加载失败')
@@ -257,6 +237,7 @@ export default {
             Api.terminate(param).then((r) => {
                 if (r.success) {
                     this.$Message.success('终止审批成功')
+                    this.$refs.userProcess.load(this.detailId)
                     this.modalCheckNo = false
                 } else {
                     this.$Message.error('加载失败')

pages/handle/examine12/index.vue

 <template>
-  <div style="padding:30px 0">
+<div style="padding:30px 0">
     <Detail :idVal="detailId" />
     <Process ref="userProcess" :idVal="detailId" :resulstInfo="testObj" />
     <div class="footers" v-if="footerStatu === '2'" style="text-align:left;">
@@ -14,39 +14,19 @@
                     </RadioGroup>
                 </FormItem>
                 <FormItem label="驳回节点：" v-if="formMyCheck.radioSp === '驳回'" prop="rejectToNodeId">
-              <Select
-                style="width:200px"
-                clearable
-                transfer
-                placeholder="请选择驳回节点"
-                v-model="formMyCheck.rejectToNodeId"
-              >
+                    <Select style="width:200px" clearable transfer placeholder="请选择驳回节点" v-model="formMyCheck.rejectToNodeId">
                         <Option value class="option-text">请选择驳回节点</Option>
-                <Option
-                  v-for="(item, index) in nodeList"
-                  :value="item.value"
-                  :label="item.label"
-                  :key="index"
-                  :disabled="item.statu > 0 ? false : true"
-                ></Option>
+                        <Option v-for="(item, index) in nodeList" :value="item.value" :label="item.label" :key="index" :disabled="item.statu > 0 ? false : true"></Option>
                     </Select>
                     <RadioGroup type="button" size="small" @on-change="changeToNode">
                         <Radio label="1">上一节点</Radio>
                         <Radio label="2">第一节点</Radio>
                     </RadioGroup>
                 </FormItem>
-            <FormItem
-              label="原因："
-              v-if="
+                <FormItem label="原因：" v-if="
                 formMyCheck.radioSp === '驳回' || formMyCheck.radioSp === '终止'
-              "
-              prop="comment"
-            >
-              <Input
-                v-model="formMyCheck.comment"
-                style="width:400px;margin-left:10px"
-                placeholder="请输入原因"
-              />
+              " prop="comment">
+                    <Input v-model="formMyCheck.comment" style="width:400px;margin-left:10px" placeholder="请输入原因" />
                 </FormItem>
                 </Col>
                 <Col span="6" style="text-align:right;padding-right:40px">
@@ -68,8 +48,9 @@
             <Button type="primary" @click="checkFalse">确定</Button>
         </div>
     </Modal>
-  </div>
+</div>
 </template>
+
 <script>
 import Api from '../api'
 import Detail from './detail'
@@ -111,30 +92,29 @@ export default {
             nextNodeUserIdList: [], //通过时提交的下一个节点UserId
             testObj: {},
             ruleValidate: {
-        rejectToNodeId: [
-          {
+                rejectToNodeId: [{
                     required: true,
                     message: '请选择驳回节点',
                     type: 'number',
                     trigger: 'change'
-          }
-        ],
-        comment: [
-          {
+                }],
+                comment: [{
                     required: true,
                     message: '请输入原因',
                     trigger: 'blur'
-          }
-        ]
+                }]
             }
         }
     },
     props: {},
-  async fetch({ store, params }) {
+    async fetch({
+        store,
+        params
+    }) {
         await store.dispatch('loadDictionary') // 加载数据字典
     },
     created() {
-    this.currentUserId=this.$store.state.userInfo.userId
+        this.currentUserId = this.$store.state.userInfo.userId
         this.detailId = this.$http.common.getquerystring('id')
         this.footerStatu = this.$http.common.getquerystring('statu')
         this.getDetailInfos(this.detailId)
@@ -148,16 +128,14 @@ export default {
                     if (valid) {
                         this.modalCheckNo = true
                         this.statuTitle = '驳回'
-          } else {
-          }
+                    } else {}
                 })
             } else {
                 this.$refs['formValidate'].validate((valid) => {
                     if (valid) {
                         this.modalCheckNo = true
                         this.statuTitle = '终止'
-          } else {
-          }
+                    } else {}
                 })
             }
         },
@@ -170,8 +148,8 @@ export default {
                 this.testObj = r
                 if (r.success) {
                     this.currentNodeID = r.result.currentNodeId
-          this.passId=r.result.currentRecordId
-          this.nextNodeUserIdList=this.$refs.userProcess.immutData//获取下一节点的审核人
+                    this.passId = r.result.currentRecordId
+                    this.nextNodeUserIdList = this.$refs.userProcess.immutData //获取下一节点的审核人
                     this.getNodes(r.result.nodes)
                 } else {
                     this.$Message.error('加载失败')
@@ -220,6 +198,7 @@ export default {
             Api.pass(param).then((r) => {
                 if (r.success) {
                     this.$Message.success('审批通过成功')
+                    this.$refs.userProcess.load(this.detailId)
                     this.modalCheckNo = false
                 } else {
                     this.$Message.error('审批通过失败')
@@ -239,6 +218,7 @@ export default {
             Api.reject(param).then((r) => {
                 if (r.success) {
                     this.$Message.success('驳回审批成功')
+                    this.$refs.userProcess.load(this.detailId)
                     this.modalCheckNo = false
                 } else {
                     this.$Message.error('加载失败')
@@ -257,6 +237,7 @@ export default {
             Api.terminate(param).then((r) => {
                 if (r.success) {
                     this.$Message.success('终止审批成功')
+                    this.$refs.userProcess.load(this.detailId)
                     this.modalCheckNo = false
                 } else {
                     this.$Message.error('加载失败')

pages/handle/examine13/index.vue

 <template>
-  <div style="padding:30px 0">
+<div style="padding:30px 0">
     <Detail :idVal="detailId" />
     <Process ref="userProcess" :idVal="detailId" :resulstInfo="testObj" />
     <div class="footers" v-if="footerStatu === '2'" style="text-align:left;">
@@ -14,39 +14,19 @@
                     </RadioGroup>
                 </FormItem>
                 <FormItem label="驳回节点：" v-if="formMyCheck.radioSp === '驳回'" prop="rejectToNodeId">
-              <Select
-                style="width:200px"
-                clearable
-                transfer
-                placeholder="请选择驳回节点"
-                v-model="formMyCheck.rejectToNodeId"
-              >
+                    <Select style="width:200px" clearable transfer placeholder="请选择驳回节点" v-model="formMyCheck.rejectToNodeId">
                         <Option value class="option-text">请选择驳回节点</Option>
-                <Option
-                  v-for="(item, index) in nodeList"
-                  :value="item.value"
-                  :label="item.label"
-                  :key="index"
-                  :disabled="item.statu > 0 ? false : true"
-                ></Option>
+                        <Option v-for="(item, index) in nodeList" :value="item.value" :label="item.label" :key="index" :disabled="item.statu > 0 ? false : true"></Option>
                     </Select>
                     <RadioGroup type="button" size="small" @on-change="changeToNode">
                         <Radio label="1">上一节点</Radio>
                         <Radio label="2">第一节点</Radio>
                     </RadioGroup>
                 </FormItem>
-            <FormItem
-              label="原因："
-              v-if="
+                <FormItem label="原因：" v-if="
                 formMyCheck.radioSp === '驳回' || formMyCheck.radioSp === '终止'
-              "
-              prop="comment"
-            >
-              <Input
-                v-model="formMyCheck.comment"
-                style="width:400px;margin-left:10px"
-                placeholder="请输入原因"
-              />
+              " prop="comment">
+                    <Input v-model="formMyCheck.comment" style="width:400px;margin-left:10px" placeholder="请输入原因" />
                 </FormItem>
                 </Col>
                 <Col span="6" style="text-align:right;padding-right:40px">
@@ -68,8 +48,9 @@
             <Button type="primary" @click="checkFalse">确定</Button>
         </div>
     </Modal>
-  </div>
+</div>
 </template>
+
 <script>
 import Api from "../api";
 import Detail from "./detail";
@@ -111,26 +92,25 @@ export default {
             nextNodeUserIdList: [], //通过时提交的下一个节点UserId
             testObj: {},
             ruleValidate: {
-        rejectToNodeId: [
-          {
+                rejectToNodeId: [{
                     required: true,
                     message: "请选择驳回节点",
                     type: "number",
                     trigger: "change"
-          }
-        ],
-        comment: [
-          {
+                }],
+                comment: [{
                     required: true,
                     message: "请输入原因",
                     trigger: "blur"
-          }
-        ]
+                }]
             }
         };
     },
     props: {},
-  async fetch({ store, params }) {
+    async fetch({
+        store,
+        params
+    }) {
         await store.dispatch("loadDictionary"); // 加载数据字典
     },
     created() {
@@ -149,16 +129,14 @@ export default {
                     if (valid) {
                         this.modalCheckNo = true;
                         this.statuTitle = "驳回";
-          } else {
-          }
+                    } else {}
                 });
             } else {
                 this.$refs["formValidate"].validate(valid => {
                     if (valid) {
                         this.modalCheckNo = true;
                         this.statuTitle = "终止";
-          } else {
-          }
+                    } else {}
                 });
             }
         },
@@ -221,6 +199,7 @@ export default {
             Api.pass(param).then(r => {
                 if (r.success) {
                     this.$Message.success("审批通过成功");
+                    this.$refs.userProcess.load(this.detailId);
                     this.modalCheckNo = false;
                 } else {
                     this.$Message.error("审批通过失败");
@@ -240,6 +219,7 @@ export default {
             Api.reject(param).then(r => {
                 if (r.success) {
                     this.$Message.success("驳回审批成功");
+                    this.$refs.userProcess.load(this.detailId);
                     this.modalCheckNo = false;
                 } else {
                     this.$Message.error("加载失败");
@@ -258,6 +238,7 @@ export default {
             Api.terminate(param).then(r => {
                 if (r.success) {
                     this.$Message.success("终止审批成功");
+                    this.$refs.userProcess.load(this.detailId);
                     this.modalCheckNo = false;
                 } else {
                     this.$Message.error("加载失败");

pages/handle/examine14/index.vue

 <template>
-  <div style="padding:30px 0">
+<div style="padding:30px 0">
     <Detail :idVal="detailId" />
     <Process ref="userProcess" :idVal="detailId" :resulstInfo="testObj" />
     <div class="footers" v-if="footerStatu === '2'" style="text-align:left;">
@@ -14,39 +14,19 @@
                     </RadioGroup>
                 </FormItem>
                 <FormItem label="驳回节点：" v-if="formMyCheck.radioSp === '驳回'" prop="rejectToNodeId">
-              <Select
-                style="width:200px"
-                clearable
-                transfer
-                placeholder="请选择驳回节点"
-                v-model="formMyCheck.rejectToNodeId"
-              >
+                    <Select style="width:200px" clearable transfer placeholder="请选择驳回节点" v-model="formMyCheck.rejectToNodeId">
                         <Option value class="option-text">请选择驳回节点</Option>
-                <Option
-                  v-for="(item, index) in nodeList"
-                  :value="item.value"
-                  :label="item.label"
-                  :key="index"
-                  :disabled="item.statu > 0 ? false : true"
-                ></Option>
+                        <Option v-for="(item, index) in nodeList" :value="item.value" :label="item.label" :key="index" :disabled="item.statu > 0 ? false : true"></Option>
                     </Select>
                     <RadioGroup type="button" size="small" @on-change="changeToNode">
                         <Radio label="1">上一节点</Radio>
                         <Radio label="2">第一节点</Radio>
                     </RadioGroup>
                 </FormItem>
-            <FormItem
-              label="原因："
-              v-if="
+                <FormItem label="原因：" v-if="
                 formMyCheck.radioSp === '驳回' || formMyCheck.radioSp === '终止'
-              "
-              prop="comment"
-            >
-              <Input
-                v-model="formMyCheck.comment"
-                style="width:400px;margin-left:10px"
-                placeholder="请输入原因"
-              />
+              " prop="comment">
+                    <Input v-model="formMyCheck.comment" style="width:400px;margin-left:10px" placeholder="请输入原因" />
                 </FormItem>
                 </Col>
                 <Col span="6" style="text-align:right;padding-right:40px">
@@ -68,8 +48,9 @@
             <Button type="primary" @click="checkFalse">确定</Button>
         </div>
     </Modal>
-  </div>
+</div>
 </template>
+
 <script>
 import Api from "../api";
 import Detail from "./detail";
@@ -111,26 +92,25 @@ export default {
             nextNodeUserIdList: [], //通过时提交的下一个节点UserId
             testObj: {},
             ruleValidate: {
-        rejectToNodeId: [
-          {
+                rejectToNodeId: [{
                     required: true,
                     message: "请选择驳回节点",
                     type: "number",
                     trigger: "change"
-          }
-        ],
-        comment: [
-          {
+                }],
+                comment: [{
                     required: true,
                     message: "请输入原因",
                     trigger: "blur"
-          }
-        ]
+                }]
             }
         };
     },
     props: {},
-  async fetch({ store, params }) {
+    async fetch({
+        store,
+        params
+    }) {
         await store.dispatch("loadDictionary"); // 加载数据字典
     },
     created() {
@@ -149,16 +129,14 @@ export default {
                     if (valid) {
                         this.modalCheckNo = true;
                         this.statuTitle = "驳回";
-          } else {
-          }
+                    } else {}
                 });
             } else {
                 this.$refs["formValidate"].validate(valid => {
                     if (valid) {
                         this.modalCheckNo = true;
                         this.statuTitle = "终止";
-          } else {
-          }
+                    } else {}
                 });
             }
         },
@@ -221,6 +199,7 @@ export default {
             Api.pass(param).then(r => {
                 if (r.success) {
                     this.$Message.success("审批通过成功");
+                    this.$refs.userProcess.load(this.detailId);
                     this.modalCheckNo = false;
                 } else {
                     this.$Message.error("审批通过失败");
@@ -240,6 +219,7 @@ export default {
             Api.reject(param).then(r => {
                 if (r.success) {
                     this.$Message.success("驳回审批成功");
+                    this.$refs.userProcess.load(this.detailId);
                     this.modalCheckNo = false;
                 } else {
                     this.$Message.error("加载失败");
@@ -258,6 +238,7 @@ export default {
             Api.terminate(param).then(r => {
                 if (r.success) {
                     this.$Message.success("终止审批成功");
+                    this.$refs.userProcess.load(this.detailId);
                     this.modalCheckNo = false;
                 } else {
                     this.$Message.error("加载失败");

pages/handle/examine2/index.vue

 <template>
-  <div style="padding:30px 0">
+<div style="padding:30px 0">
     <Detail :idVal="detailId" />
 
     <Process ref="userProcess" :idVal="detailId" />
     <div class="footers" v-if="footerStatu === '2'" style="text-align:left;">
-      <Form
-        :model="formMyCheck"
-        :label-width="100"
-        :rules="ruleValidate"
-        inline
-        ref="formValidate"
-      >
+        <Form :model="formMyCheck" :label-width="100" :rules="ruleValidate" inline ref="formValidate">
             <Row>
                 <Col span="18">
                 <FormItem label="审批意见：">
@@ -20,44 +14,20 @@
                         <Radio label="终止"></Radio>
                     </RadioGroup>
                 </FormItem>
-            <FormItem
-              label="驳回节点："
-              v-if="formMyCheck.radioSp === '驳回'"
-              prop="rejectToNodeId"
-            >
-              <Select
-                style="width:200px"
-                clearable
-                transfer
-                placeholder="请选择驳回节点"
-                v-model="formMyCheck.rejectToNodeId"
-              >
+                <FormItem label="驳回节点：" v-if="formMyCheck.radioSp === '驳回'" prop="rejectToNodeId">
+                    <Select style="width:200px" clearable transfer placeholder="请选择驳回节点" v-model="formMyCheck.rejectToNodeId">
                         <Option value class="option-text">请选择驳回节点</Option>
-                <Option
-                  v-for="(item, index) in nodeList"
-                  :value="item.value"
-                  :label="item.label"
-                  :key="index"
-                  :disabled="item.statu > 0 ? false : true"
-                ></Option>
+                        <Option v-for="(item, index) in nodeList" :value="item.value" :label="item.label" :key="index" :disabled="item.statu > 0 ? false : true"></Option>
                     </Select>
                     <RadioGroup type="button" size="small" @on-change="changeToNode">
                         <Radio label="1">上一节点</Radio>
                         <Radio label="2">第一节点</Radio>
                     </RadioGroup>
                 </FormItem>
-            <FormItem
-              label="原因："
-              v-if="
+                <FormItem label="原因：" v-if="
                 formMyCheck.radioSp === '驳回' || formMyCheck.radioSp === '终止'
-              "
-              prop="comment"
-            >
-              <Input
-                v-model="formMyCheck.comment"
-                style="width:400px;margin-left:10px"
-                placeholder="请输入原因"
-              />
+              " prop="comment">
+                    <Input v-model="formMyCheck.comment" style="width:400px;margin-left:10px" placeholder="请输入原因" />
                 </FormItem>
                 </Col>
                 <Col span="6" style="text-align:right;padding-right:40px">
@@ -66,12 +36,7 @@
             </Row>
         </Form>
     </div>
-    <Modal
-      v-model="modalCheckNo"
-      title="订单审批"
-      width="800"
-      :scrollable="true"
-    >
+    <Modal v-model="modalCheckNo" title="订单审批" width="800" :scrollable="true">
         <br />
         <h4>
             您确定 <span class="new-red">{{ statuTitle }}</span> 此订单审批？
@@ -82,8 +47,9 @@
             <Button type="primary" @click="checkFalse">确定</Button>
         </div>
     </Modal>
-  </div>
+</div>
 </template>
+
 <script>
 import Api from '../api'
 import Detail from './detail'
@@ -123,30 +89,29 @@ export default {
             preNodeID: null, //上一个节点
             nextNodeUserIdList: [], //通过时提交的下一个节点UserId
             ruleValidate: {
-        rejectToNodeId: [
-          {
+                rejectToNodeId: [{
                     required: true,
                     message: '请选择驳回节点',
                     type: 'number',
                     trigger: 'change'
-          }
-        ],
-        comment: [
-          {
+                }],
+                comment: [{
                     required: true,
                     message: '请输入原因',
                     trigger: 'blur'
-          }
-        ]
+                }]
             }
         }
     },
     props: {},
-  async fetch({ store, params }) {
+    async fetch({
+        store,
+        params
+    }) {
         await store.dispatch('loadDictionary') // 加载数据字典
     },
     created() {
-    this.currentUserId=this.$store.state.userInfo.userId
+        this.currentUserId = this.$store.state.userInfo.userId
         this.detailId = this.$http.common.getquerystring('id')
         this.footerStatu = this.$http.common.getquerystring('statu')
         this.getDetailInfos(this.detailId)
@@ -161,16 +126,14 @@ export default {
                     if (valid) {
                         this.modalCheckNo = true
                         this.statuTitle = '驳回'
-          } else {
-          }
+                    } else {}
                 })
             } else {
                 this.$refs['formValidate'].validate((valid) => {
                     if (valid) {
                         this.modalCheckNo = true
                         this.statuTitle = '终止'
-          } else {
-          }
+                    } else {}
                 })
             }
         },
@@ -182,8 +145,8 @@ export default {
             Api.getdetail(param).then((r) => {
                 if (r.success) {
                     this.currentNodeID = r.result.currentNodeId
-          this.passId=r.result.currentRecordId
-          this.nextNodeUserIdList=this.$refs.userProcess.immutData//获取下一节点的审核人
+                    this.passId = r.result.currentRecordId
+                    this.nextNodeUserIdList = this.$refs.userProcess.immutData //获取下一节点的审核人
                     this.getNodes(r.result.nodes)
                 } else {
                     this.$Message.error('加载失败')
@@ -230,13 +193,14 @@ export default {
             Api.pass(param).then((r) => {
                 if (r.success) {
                     this.$Message.success('审批通过成功')
-          this.footerStatu=3
+                    this.$refs.userProcess.load(this.detailId)
+                    this.footerStatu = 3
                 } else {
                     this.$Message.error('审批通过失败')
                 }
             })
             this.modalCheckNo = false
-      this.footerStatu=3
+            this.footerStatu = 3
         },
         //审批驳回
         checkNo() {
@@ -249,7 +213,8 @@ export default {
             Api.reject(param).then((r) => {
                 if (r.success) {
                     this.$Message.success('驳回审批成功')
-          this.footerStatu=3
+                    this.$refs.userProcess.load(this.detailId)
+                    this.footerStatu = 3
                 } else {
                     this.$Message.error('加载失败')
                 }
@@ -267,7 +232,8 @@ export default {
             Api.terminate(param).then((r) => {
                 if (r.success) {
                     this.$Message.success('终止审批成功')
-          this.footerStatu=3
+                    this.$refs.userProcess.load(this.detailId)
+                    this.footerStatu = 3
                 } else {
                     this.$Message.error('加载失败')
                 }

pages/handle/examine3/index.vue

 <template>
-  <div style="padding:30px 0">
+<div style="padding:30px 0">
     <Detail :idVal="detailId" />
     <Process ref="userProcess" :idVal="detailId" />
     <div class="footers" v-if="footerStatu === '2'" style="text-align:left;">
-      <Form
-        :model="formMyCheck"
-        :label-width="100"
-        :rules="ruleValidate"
-        inline
-        ref="formValidate"
-      >
+        <Form :model="formMyCheck" :label-width="100" :rules="ruleValidate" inline ref="formValidate">
             <Row>
                 <Col span="18">
                 <FormItem label="审批意见：">
@@ -19,44 +13,20 @@
                         <Radio label="终止"></Radio>
                     </RadioGroup>
                 </FormItem>
-            <FormItem
-              label="驳回节点："
-              v-if="formMyCheck.radioSp === '驳回'"
-              prop="rejectToNodeId"
-            >
-              <Select
-                style="width:200px"
-                clearable
-                transfer
-                placeholder="请选择驳回节点"
-                v-model="formMyCheck.rejectToNodeId"
-              >
+                <FormItem label="驳回节点：" v-if="formMyCheck.radioSp === '驳回'" prop="rejectToNodeId">
+                    <Select style="width:200px" clearable transfer placeholder="请选择驳回节点" v-model="formMyCheck.rejectToNodeId">
                         <Option value class="option-text">请选择驳回节点</Option>
-                <Option
-                  v-for="(item, index) in nodeList"
-                  :value="item.value"
-                  :label="item.label"
-                  :key="index"
-                  :disabled="item.statu > 0 ? false : true"
-                ></Option>
+                        <Option v-for="(item, index) in nodeList" :value="item.value" :label="item.label" :key="index" :disabled="item.statu > 0 ? false : true"></Option>
                     </Select>
                     <RadioGroup type="button" size="small" @on-change="changeToNode">
                         <Radio label="1">上一节点</Radio>
                         <Radio label="2">第一节点</Radio>
                     </RadioGroup>
                 </FormItem>
-            <FormItem
-              label="原因："
-              v-if="
+                <FormItem label="原因：" v-if="
                 formMyCheck.radioSp === '驳回' || formMyCheck.radioSp === '终止'
-              "
-              prop="comment"
-            >
-              <Input
-                v-model="formMyCheck.comment"
-                style="width:400px;margin-left:10px"
-                placeholder="请输入原因"
-              />
+              " prop="comment">
+                    <Input v-model="formMyCheck.comment" style="width:400px;margin-left:10px" placeholder="请输入原因" />
                 </FormItem>
                 </Col>
                 <Col span="6" style="text-align:right;padding-right:40px">
@@ -65,12 +35,7 @@
             </Row>
         </Form>
     </div>
-    <Modal
-      v-model="modalCheckNo"
-      title="订单审批"
-      width="800"
-      :scrollable="true"
-    >
+    <Modal v-model="modalCheckNo" title="订单审批" width="800" :scrollable="true">
         <br />
         <h4>
             您确定 <span class="new-red">{{ statuTitle }}</span> 此工艺规程审批？
@@ -81,8 +46,9 @@
             <Button type="primary" @click="checkFalse">确定</Button>
         </div>
     </Modal>
-  </div>
+</div>
 </template>
+
 <script>
 import Api from '../api'
 import Detail from './detail'
@@ -122,30 +88,29 @@ export default {
             preNodeID: null, //上一个节点
             nextNodeUserIdList: [], //通过时提交的下一个节点UserId
             ruleValidate: {
-        rejectToNodeId: [
-          {
+                rejectToNodeId: [{
                     required: true,
                     message: '请选择驳回节点',
                     type: 'number',
                     trigger: 'change'
-          }
-        ],
-        comment: [
-          {
+                }],
+                comment: [{
                     required: true,
                     message: '请输入原因',
                     trigger: 'blur'
-          }
-        ]
+                }]
             }
         }
     },
     props: {},
-  async fetch({ store, params }) {
+    async fetch({
+        store,
+        params
+    }) {
         await store.dispatch('loadDictionary') // 加载数据字典
     },
     created() {
-    this.currentUserId=this.$store.state.userInfo.userId
+        this.currentUserId = this.$store.state.userInfo.userId
         this.detailId = this.$http.common.getquerystring('id')
         this.footerStatu = this.$http.common.getquerystring('statu')
         this.getDetailInfos(this.detailId)
@@ -160,16 +125,14 @@ export default {
                     if (valid) {
                         this.modalCheckNo = true
                         this.statuTitle = '驳回'
-          } else {
-          }
+                    } else {}
                 })
             } else {
                 this.$refs['formValidate'].validate((valid) => {
                     if (valid) {
                         this.modalCheckNo = true
                         this.statuTitle = '终止'
-          } else {
-          }
+                    } else {}
                 })
             }
         },
@@ -181,8 +144,8 @@ export default {
             Api.getdetail(param).then((r) => {
                 if (r.success) {
                     this.currentNodeID = r.result.currentNodeId
-          this.passId=r.result.currentRecordId
-          this.nextNodeUserIdList=this.$refs.userProcess.immutData//获取下一节点的审核人
+                    this.passId = r.result.currentRecordId
+                    this.nextNodeUserIdList = this.$refs.userProcess.immutData //获取下一节点的审核人
                     this.getNodes(r.result.nodes)
                 } else {
                     this.$Message.error('加载失败')
@@ -230,6 +193,7 @@ export default {
             Api.pass(param).then((r) => {
                 if (r.success) {
                     this.$Message.success('审批通过成功')
+                    this.$refs.userProcess.load(this.detailId)
                     this.footerStatu = 3
                 } else {
                     this.$Message.error('审批通过失败')
@@ -248,6 +212,7 @@ export default {
             Api.reject(param).then((r) => {
                 if (r.success) {
                     this.$Message.success('驳回审批成功')
+                    this.$refs.userProcess.load(this.detailId)
                     this.footerStatu = 3
                 } else {
                     this.$Message.error('加载失败')
@@ -265,6 +230,7 @@ export default {
             Api.terminate(param).then((r) => {
                 if (r.success) {
                     this.$Message.success('终止审批成功')
+                    this.$refs.userProcess.load(this.detailId)
                     this.footerStatu = 3
                 } else {
                     this.$Message.error('加载失败')

pages/handle/examine4/index.vue

 <template>
-  <div style="padding:30px 0">
+<div style="padding:30px 0">
     <Detail :idVal="detailId" />
-    <Process ref="userProcess" :idVal="detailId" :resulstInfo="testObj"/>
+    <Process ref="userProcess" :idVal="detailId" :resulstInfo="testObj" />
     <div class="footers" v-if="footerStatu === '2'">
         <Form :model="formMyCheck" :label-width="100">
             <Row>
@@ -12,37 +12,15 @@
                         <Radio label="驳回"></Radio>
                         <!-- <Radio label="终止"></Radio> -->
                     </RadioGroup>
-              <Select
-                v-if="formMyCheck.radioSp === '驳回'"
-                style="width:200px"
-                clearable
-                transfer
-                placeholder="请选择驳回节点"
-                v-model="formMyCheck.rejectToNodeId"
-              >
+                    <Select v-if="formMyCheck.radioSp === '驳回'" style="width:200px" clearable transfer placeholder="请选择驳回节点" v-model="formMyCheck.rejectToNodeId">
                         <Option value class="option-text">请选择驳回节点</Option>
-                <Option
-                  v-for="(item, index) in nodeList"
-                  :value="item.value"
-                  :label="item.label"
-                  :key="index"
-                  :disabled="item.statu > 0 ? false : true"
-                ></Option>
+                        <Option v-for="(item, index) in nodeList" :value="item.value" :label="item.label" :key="index" :disabled="item.statu > 0 ? false : true"></Option>
                     </Select>
-              <RadioGroup
-                v-if="formMyCheck.radioSp === '驳回'"
-                type="button"
-                size="small"
-                @on-change="changeToNode"
-              >
+                    <RadioGroup v-if="formMyCheck.radioSp === '驳回'" type="button" size="small" @on-change="changeToNode">
                         <Radio label="1">上一节点</Radio>
                         <Radio label="2">第一节点</Radio>
                     </RadioGroup>
-              <Input
-                v-if="formMyCheck.radioSp === '驳回'"
-                v-model="formMyCheck.comment"
-                style="width:400px;margin-left:10px"
-                placeholder="请填写原因"/>
+                    <Input v-if="formMyCheck.radioSp === '驳回'" v-model="formMyCheck.comment" style="width:400px;margin-left:10px" placeholder="请填写原因" />
                 </FormItem>
                 </Col>
                 <Col span="6" style="text-align:right;padding-right:40px">
@@ -52,12 +30,7 @@
         </Form>
     </div>
 
-    <Modal
-      v-model="modalCheckNo"
-      title="材料消耗单审批"
-      width="800"
-      :scrollable="true"
-    >
+    <Modal v-model="modalCheckNo" title="材料消耗单审批" width="800" :scrollable="true">
         <br />
         <h4>
             您确定 <span class="new-red">{{ statuTitle }}</span> 此材料消耗单审批？
@@ -68,8 +41,9 @@
             <Button type="primary" @click="checkFalse">确定</Button>
         </div>
     </Modal>
-  </div>
+</div>
 </template>
+
 <script>
 import Api from '../api'
 import Detail from './detail'
@@ -84,7 +58,7 @@ export default {
     },
     data() {
         return {
-      currentUserId:0,
+            currentUserId: 0,
             formMyCheck: {
                 radioSp: '通过',
                 comment: '',
@@ -108,15 +82,18 @@ export default {
             firstNodeID: null, //第一个节点
             preNodeID: null, //上一个节点
             nextNodeUserIdList: [], //通过时提交的下一个节点UserId
-      testObj:{}
+            testObj: {}
         }
     },
     props: {},
-  async fetch({ store, params }) {
+    async fetch({
+        store,
+        params
+    }) {
         await store.dispatch('loadDictionary') // 加载数据字典
     },
     created() {
-    this.currentUserId=this.$store.state.userInfo.userId
+        this.currentUserId = this.$store.state.userInfo.userId
         this.detailId = this.$http.common.getquerystring('id')
         this.footerStatu = this.$http.common.getquerystring('statu')
         this.getDetailInfos(this.detailId)
@@ -128,11 +105,11 @@ export default {
             if (this.formMyCheck.radioSp == '通过') {
                 this.checkOk()
             } else if (this.formMyCheck.radioSp == '驳回') {
-        if(rejectToNode == null){
+                if (rejectToNode == null) {
                     this.$Message.error('请选择驳回节点')
                     return
                 }
-        if(commasge == ''){
+                if (commasge == '') {
                     this.$Message.error('请填写驳回原因')
                     return
                 }
@@ -154,11 +131,11 @@ export default {
                 Id: idVal
             }
             Api.getdetail(param).then((r) => {
-        this.testObj=r
+                this.testObj = r
                 if (r.success) {
                     this.currentNodeID = r.result.currentNodeId
-          this.passId=r.result.currentRecordId
-          this.nextNodeUserIdList=this.$refs.userProcess.immutData//获取下一节点的审核人
+                    this.passId = r.result.currentRecordId
+                    this.nextNodeUserIdList = this.$refs.userProcess.immutData //获取下一节点的审核人
                     this.getNodes(r.result.nodes)
                 } else {
                     this.$Message.error('加载失败')
@@ -187,7 +164,6 @@ export default {
                 this.preNodeID = this.nodeList[0].value
             }
 
-      
         },
         changeToNode(val) {
             if (val == '1') {
@@ -207,6 +183,7 @@ export default {
             Api.pass(param).then((r) => {
                 if (r.success) {
                     this.$Message.success('审批通过成功')
+                    this.$refs.userProcess.load(this.detailId)
                     this.footerStatu = 3
                 } else {
                     this.$Message.error('审批通过失败')
@@ -224,6 +201,7 @@ export default {
             Api.reject(param).then((r) => {
                 if (r.success) {
                     this.$Message.success('驳回审批成功')
+                    this.$refs.userProcess.load(this.detailId)
                     this.footerStatu = 3
                 } else {
                     this.$Message.error('加载失败')
@@ -240,6 +218,7 @@ export default {
             Api.terminate(param).then((r) => {
                 if (r.success) {
                     this.$Message.success('终止审批成功')
+                    this.$refs.userProcess.load(this.detailId)
                     this.footerStatu = 3
                 } else {
                     this.$Message.error('加载失败')
@@ -255,7 +234,7 @@ export default {
             // else if (this.formMyCheck.radioSp == '终止') {
             //   this.checkCancel()
             // }
-      this.footerStatu=3
+            this.footerStatu = 3
         },
         l(key) {
             key = 'MaterialPlacode' + '.' + key

pages/handle/examine6/index.vue

 <template>
-  <div style="padding:30px 0">
+<div style="padding:30px 0">
     <Detail :idVal="detailId" />
     <Process ref="userProcess" :idVal="detailId" :resulstInfo="testObj" />
     <div class="footers" v-if="footerStatu === '2'" style="text-align:left;">
-      <Form
-        :model="formMyCheck"
-        :label-width="100"
-        :rules="ruleValidate"
-        inline
-        ref="formValidate"
-      >
+        <Form :model="formMyCheck" :label-width="100" :rules="ruleValidate" inline ref="formValidate">
             <Row>
                 <Col span="18">
                 <FormItem label="审批意见：">
@@ -19,44 +13,20 @@
                         <Radio label="终止"></Radio>
                     </RadioGroup>
                 </FormItem>
-            <FormItem
-              label="驳回节点："
-              v-if="formMyCheck.radioSp === '驳回'"
-              prop="rejectToNodeId"
-            >
-              <Select
-                style="width:200px"
-                clearable
-                transfer
-                placeholder="请选择驳回节点"
-                v-model="formMyCheck.rejectToNodeId"
-              >
+                <FormItem label="驳回节点：" v-if="formMyCheck.radioSp === '驳回'" prop="rejectToNodeId">
+                    <Select style="width:200px" clearable transfer placeholder="请选择驳回节点" v-model="formMyCheck.rejectToNodeId">
                         <Option value class="option-text">请选择驳回节点</Option>
-                <Option
-                  v-for="(item, index) in nodeList"
-                  :value="item.value"
-                  :label="item.label"
-                  :key="index"
-                  :disabled="item.statu > 0 ? false : true"
-                ></Option>
+                        <Option v-for="(item, index) in nodeList" :value="item.value" :label="item.label" :key="index" :disabled="item.statu > 0 ? false : true"></Option>
                     </Select>
                     <RadioGroup type="button" size="small" @on-change="changeToNode">
                         <Radio label="1">上一节点</Radio>
                         <Radio label="2">第一节点</Radio>
                     </RadioGroup>
                 </FormItem>
-            <FormItem
-              label="原因："
-              v-if="
+                <FormItem label="原因：" v-if="
                 formMyCheck.radioSp === '驳回' || formMyCheck.radioSp === '终止'
-              "
-              prop="comment"
-            >
-              <Input
-                v-model="formMyCheck.comment"
-                style="width:400px;margin-left:10px"
-                placeholder="请输入原因"
-              />
+              " prop="comment">
+                    <Input v-model="formMyCheck.comment" style="width:400px;margin-left:10px" placeholder="请输入原因" />
                 </FormItem>
                 </Col>
                 <Col span="6" style="text-align:right;padding-right:40px">
@@ -115,8 +85,9 @@
             <Button type="primary" @click="checkFalse">确定</Button>
         </div>
     </Modal>
-  </div>
+</div>
 </template>
+
 <script>
 import Api from '../api'
 import Detail from './detail'
@@ -158,30 +129,29 @@ export default {
             nextNodeUserIdList: [], //通过时提交的下一个节点UserId
             testObj: {},
             ruleValidate: {
-        rejectToNodeId: [
-          {
+                rejectToNodeId: [{
                     required: true,
                     message: '请选择驳回节点',
                     type: 'number',
                     trigger: 'change'
-          }
-        ],
-        comment: [
-          {
+                }],
+                comment: [{
                     required: true,
                     message: '请输入原因',
                     trigger: 'blur'
-          }
-        ]
+                }]
             }
         }
     },
     props: {},
-  async fetch({ store, params }) {
+    async fetch({
+        store,
+        params
+    }) {
         await store.dispatch('loadDictionary') // 加载数据字典
     },
     created() {
-    this.currentUserId=this.$store.state.userInfo.userId
+        this.currentUserId = this.$store.state.userInfo.userId
         this.detailId = this.$http.common.getquerystring('id')
         this.footerStatu = this.$http.common.getquerystring('statu')
         console.log(this.detailId)
@@ -198,16 +168,14 @@ export default {
                     if (valid) {
                         this.modalCheckNo = true
                         this.statuTitle = '驳回'
-          } else {
-          }
+                    } else {}
                 })
             } else {
                 this.$refs['formValidate'].validate((valid) => {
                     if (valid) {
                         this.modalCheckNo = true
                         this.statuTitle = '终止'
-          } else {
-          }
+                    } else {}
                 })
             }
         },
@@ -220,8 +188,8 @@ export default {
                 this.testObj = r
                 if (r.success) {
                     this.currentNodeID = r.result.currentNodeId
-          this.passId=r.result.currentRecordId
-          this.nextNodeUserIdList=this.$refs.userProcess.immutData//获取下一节点的审核人
+                    this.passId = r.result.currentRecordId
+                    this.nextNodeUserIdList = this.$refs.userProcess.immutData //获取下一节点的审核人
                     this.getNodes(r.result.nodes)
                 } else {
                     this.$Message.error('加载失败')
@@ -263,7 +231,7 @@ export default {
             let param = {
                 id: this.passId,
                 comment: '',
-        nextOperationIdList: this.nextNodeUserIdList,//this.nextNodeUserIdList
+                nextOperationIdList: this.nextNodeUserIdList, //this.nextNodeUserIdList
                 data: {}
             }
             console.log(param)
@@ -271,7 +239,8 @@ export default {
             Api.pass(param).then((r) => {
                 if (r.success) {
                     this.$Message.success('审批通过成功')
-          this.footerStatu=3
+                    this.$refs.userProcess.load(this.detailId)
+                    this.footerStatu = 3
                     this.modalCheckNo = false
                 } else {
                     this.$Message.error('审批通过失败')
@@ -291,7 +260,8 @@ export default {
             Api.reject(param).then((r) => {
                 if (r.success) {
                     this.$Message.success('驳回审批成功')
-          this.footerStatu=3
+                    this.$refs.userProcess.load(this.detailId)
+                    this.footerStatu = 3
                 } else {
                     this.$Message.error('加载失败')
                 }
@@ -309,7 +279,8 @@ export default {
             Api.terminate(param).then((r) => {
                 if (r.success) {
                     this.$Message.success('终止审批成功')
-          this.footerStatu=3
+                    this.$refs.userProcess.load(this.detailId)
+                    this.footerStatu = 3
                 } else {
                     this.$Message.error('加载失败')
                 }

pages/handle/examine9/index.vue

 <template>
-  <div style="padding:30px 0">
+<div style="padding:30px 0">
     <Detail :idVal="detailId" />
     <Process ref="userProcess" :idVal="detailId" :resulstInfo="testObj" />
     <div class="footers" v-if="footerStatu === '2'" style="text-align:left;">
@@ -14,39 +14,19 @@
                     </RadioGroup>
                 </FormItem>
                 <FormItem label="驳回节点：" v-if="formMyCheck.radioSp === '驳回'" prop="rejectToNodeId">
-              <Select
-                style="width:200px"
-                clearable
-                transfer
-                placeholder="请选择驳回节点"
-                v-model="formMyCheck.rejectToNodeId"
-              >
+                    <Select style="width:200px" clearable transfer placeholder="请选择驳回节点" v-model="formMyCheck.rejectToNodeId">
                         <Option value class="option-text">请选择驳回节点</Option>
-                <Option
-                  v-for="(item, index) in nodeList"
-                  :value="item.value"
-                  :label="item.label"
-                  :key="index"
-                  :disabled="item.statu > 0 ? false : true"
-                ></Option>
+                        <Option v-for="(item, index) in nodeList" :value="item.value" :label="item.label" :key="index" :disabled="item.statu > 0 ? false : true"></Option>
                     </Select>
                     <RadioGroup type="button" size="small" @on-change="changeToNode">
                         <Radio label="1">上一节点</Radio>
                         <Radio label="2">第一节点</Radio>
                     </RadioGroup>
                 </FormItem>
-            <FormItem
-              label="原因："
-              v-if="
+                <FormItem label="原因：" v-if="
                 formMyCheck.radioSp === '驳回' || formMyCheck.radioSp === '终止'
-              "
-              prop="comment"
-            >
-              <Input
-                v-model="formMyCheck.comment"
-                style="width:400px;margin-left:10px"
-                placeholder="请输入原因"
-              />
+              " prop="comment">
+                    <Input v-model="formMyCheck.comment" style="width:400px;margin-left:10px" placeholder="请输入原因" />
                 </FormItem>
                 </Col>
                 <Col span="6" style="text-align:right;padding-right:40px">
@@ -67,8 +47,9 @@
             <Button type="primary" @click="checkFalse">确定</Button>
         </div>
     </Modal>
-  </div>
+</div>
 </template>
+
 <script>
 import Api from '../api'
 import Detail from './detail'
@@ -110,30 +91,29 @@ export default {
             nextNodeUserIdList: [], //通过时提交的下一个节点UserId
             testObj: {},
             ruleValidate: {
-        rejectToNodeId: [
-          {
+                rejectToNodeId: [{
                     required: true,
                     message: '请选择驳回节点',
                     type: 'number',
                     trigger: 'change'
-          }
-        ],
-        comment: [
-          {
+                }],
+                comment: [{
                     required: true,
                     message: '请输入原因',
                     trigger: 'blur'
-          }
-        ]
+                }]
             }
         }
     },
     props: {},
-  async fetch({ store, params }) {
+    async fetch({
+        store,
+        params
+    }) {
         await store.dispatch('loadDictionary') // 加载数据字典
     },
     created() {
-    this.currentUserId=this.$store.state.userInfo.userId
+        this.currentUserId = this.$store.state.userInfo.userId
         this.detailId = this.$http.common.getquerystring('id')
         this.footerStatu = this.$http.common.getquerystring('statu')
         this.getDetailInfos(this.detailId)
@@ -147,16 +127,14 @@ export default {
                     if (valid) {
                         this.modalCheckNo = true
                         this.statuTitle = '驳回'
-          } else {
-          }
+                    } else {}
                 })
             } else {
                 this.$refs['formValidate'].validate((valid) => {
                     if (valid) {
                         this.modalCheckNo = true
                         this.statuTitle = '终止'
-          } else {
-          }
+                    } else {}
                 })
             }
         },
@@ -169,8 +147,8 @@ export default {
                 this.testObj = r
                 if (r.success) {
                     this.currentNodeID = r.result.currentNodeId
-          this.passId=r.result.currentRecordId
-          this.nextNodeUserIdList=this.$refs.userProcess.immutData//获取下一节点的审核人
+                    this.passId = r.result.currentRecordId
+                    this.nextNodeUserIdList = this.$refs.userProcess.immutData //获取下一节点的审核人
                     this.getNodes(r.result.nodes)
                 } else {
                     this.$Message.error('加载失败')
@@ -219,6 +197,7 @@ export default {
             Api.pass(param).then((r) => {
                 if (r.success) {
                     this.$Message.success('审批通过成功')
+                    this.$refs.userProcess.load(this.detailId)
                     this.modalCheckNo = false
                 } else {
                     this.$Message.error('审批通过失败')
@@ -238,6 +217,7 @@ export default {
             Api.reject(param).then((r) => {
                 if (r.success) {
                     this.$Message.success('驳回审批成功')
+                    this.$refs.userProcess.load(this.detailId)
                 } else {
                     this.$Message.error('加载失败')
                 }
@@ -255,6 +235,7 @@ export default {
             Api.terminate(param).then((r) => {
                 if (r.success) {
                     this.$Message.success('终止审批成功')
+                    this.$refs.userProcess.load(this.detailId)
                 } else {
                     this.$Message.error('加载失败')
                 }

pages/handle/process.vue

-<style lang="less" scope>
+<style lang="less">
 @import "./shen.less";
 </style>
 <template>
-  <div class="Design">
+<div class="Design">
     <h3>{{ processTitle }}</h3>
     <Divider />
     <Timeline>
@@ -27,29 +27,19 @@
                 <div v-if="index>cur">
                     <CheckboxGroup v-model="immutData">
                         <span>审批人：</span>
-              <Checkbox
-                v-for="(item1, index1) in item.defaultUsers.immutable"
-                :key="index1"
-                :label="item1"
-                :disabled="item.isFixed"
-              >
+                        <Checkbox v-for="(item1, index1) in item.defaultUsers.immutable" :key="index1" :label="item1" :disabled="item.isFixed">
                             <User :value="item1" style="margin-right:5px;" />
                         </Checkbox>
                     </CheckboxGroup>
                 </div>
                 <div class="wait" v-else>
                     <span>审批人：</span>
-            <User
-              v-for="(item2, index2) in item.defaultUsers.immutable"
-              :key="index2"
-              :value="item2"
-              class="mr5"
-            />
+                    <User v-for="(item2, index2) in item.defaultUsers.immutable" :key="index2" :value="item2" class="mr5" />
                 </div>
                 <div style="width:98%" v-if="com(item.records).length>0">
                     <!-- <Table :columns="columns" border size="small" width="90%" :data="com(item.records)"></Table> -->
                     <p class="shen_row" v-for="(item3, index3) in item.records" :key="index3" :value="item3">
-              <User class="user_span" :value="item3.operatorId"/>
+                        <User class="user_span" :value="item3.operatorId" />
                         <span class="plr row_time">{{item3.operationTime}}</span>
                         <state code="workflow.record.status" class="row_statu" :value="item3.status" type="text"></state>
                         <span class="plr remark" v-if="item3.remark">{{item3.remark}}</span>
@@ -60,14 +50,18 @@
             </div>
         </TimelineItem>
     </Timeline>
-  </div>
+</div>
 </template>
+
 <script>
 import Api from './api'
 export default {
     name: 'process',
     components: {},
-  async fetch({ store, params }) {
+    async fetch({
+        store,
+        params
+    }) {
         await store.dispatch('loadDictionary') // 加载数据字典
     },
     data() {
@@ -78,8 +72,7 @@ export default {
             dataImmut: [],
             creatRows: [],
             cur: 0,
-      columns: [
-        {
+            columns: [{
                     key: 'status',
                     title: '结果',
                     align: 'left',
@@ -101,7 +94,11 @@ export default {
                     easy: true,
                     high: true,
                     render: (h, params) => {
-            return h('User', { attrs: { value: params.row.operatorId } })
+                        return h('User', {
+                            attrs: {
+                                value: params.row.operatorId
+                            }
+                        })
                     }
                 },
                 {
@@ -123,8 +120,11 @@ export default {
                     render: (h, params) => {
                         if (params.row.contextData.length > 2)
                             return h(
-                'a',
-                { on: { click: () => this.edit(params.row) } },
+                                'a', {
+                                    on: {
+                                        click: () => this.edit(params.row)
+                                    }
+                                },
                                 '详情'
                             )
                         return h('span', '')
@@ -143,11 +143,16 @@ export default {
         }
     },
     created() {
-    this.currentUserId=this.$store.state.userInfo.userId
+        this.currentUserId = this.$store.state.userInfo.userId
         this.dataImmut = []
         this.dataMut = []
-
-    Api.getdetail({ Id: this.idVal }).then((r) => {
+        this.load(this.idVal)
+    },
+    methods: {
+        load(v) {
+            Api.getdetail({
+                Id: v
+            }).then((r) => {
                 if (r.success) {
                     this.dataImmut = r.result.nodes
                     this.currentNodeId = r.result.currentNodeId
@@ -159,12 +164,12 @@ export default {
                         };
                         // if(u.defaultUsers.mutable&&u.defaultUsers.mutable.length>0){
                         // u.defaultUsers.immutable=u.defaultUsers.immutable.concat(u.defaultUsers.mutable)
-            u.defaultUsers.immutable=u.defaultUsers.immutable||(u.defaultUsers.mutable)//审核人员bug
+                        u.defaultUsers.immutable = u.defaultUsers.immutable || (u.defaultUsers.mutable) //审核人员bug
                         // }
                     })
                     if (this.dataImmut.length > this.cur + 1) {
                         // console.log("this.dataImmut[this.cur + 1]:",this.dataImmut[this.cur + 1],this.cur,this.dataImmut.length )
-          this.immutData = this.dataImmut[this.cur + 1].defaultUsers.immutable||(this.dataImmut[this.cur + 1].defaultUsers.mutable)//审核人员bug
+                        this.immutData = this.dataImmut[this.cur + 1].defaultUsers.immutable || (this.dataImmut[this.cur + 1].defaultUsers.mutable) //审核人员bug
                     }
 
                 } else {
@@ -172,8 +177,6 @@ export default {
                 }
             })
         },
-  methods: {
-    load(v) {},
         type(i) {
             if (i < this.cur) {
                 return 'primary'
@@ -191,7 +194,7 @@ export default {
             console.log(record)
         },
         com(items) {
-      if(items)
+            if (items)
                 return items.filter((u) => {
                     return [2, 3, 5, 6].indexOf(u.status) > -1
                 })

pages/mesPlan/index.vue

@@ -57,8 +57,9 @@
             <Detail :row="rowData" />
         </Modal>
         <Modal v-model="splitModal" title="订单分解" width="1200">
-            <Split :row="rowData" ref="orderSplit" />
+            <Split :row="rowData" ref="orderSplit" @on-amount="getAmount" />
             <div slot="footer">
+                <span class="pr240">剩余产品数量：{{amountNew}}</span>
                 <Button @click="splitModal = false">取消</Button>
                 <Button type="primary" @click="orderSplitOk">确定分解</Button>
             </div>
@@ -487,7 +488,8 @@ export default {
                 codeList: [], //订单编号List
                 operatorIdList: [] //操作员id
             }, //确定后返回数据
-            wfstatu: 1 //流程是否启用1 禁用 0启用
+            wfstatu: 1, //流程是否启用1 禁用 0启用
+            amountNew: 0,
         };
     },
     created() {
@@ -575,11 +577,16 @@ export default {
         split(row) {
             if (row.quantity > 1) {
                 this.splitModal = true;
+                this.amountNew = row.quantity
                 this.rowData = row;
             } else {
                 this.$Message.error("数量为1，不能进行分解");
             }
         },
+        //获取可分解剩余条数
+        getAmount(val) {
+            this.amountNew = val
+        },
         onHide() {
             // this.$Message.info("收起左侧树")
             this.showMenu = false;

pages/mesPlan/split.vue

@@ -33,7 +33,7 @@
             </Col>
             <Col span="12">
             <FormItem label="分解数量" style="width:100%" prop="splitQuantity">
-                <InputNumber :min="2" :max="orderForm.quantity" v-model="orderForm.splitQuantity" style="width:180px"></InputNumber>
+                <InputNumber :min="1" :max="orderForm.quantity" v-model="orderForm.splitQuantity" style="width:180px"></InputNumber>
                 <Button type="primary" @click="addSplitOrder" v-noClick>确定</Button>
             </FormItem>
             </Col>
@@ -47,10 +47,6 @@
             <DatePicker v-model="row.demandDate" type="daterange" placeholder="请选择日期" style="width:240px" :transfer="true" :options="optionsDate" @on-change="inputOrderCat(row,index)"></DatePicker>
         </template>
     </Table>
-    <div class="cellblock">
-        <p>剩余产品数量：{{amount}}</p>
-    </div>
-
 </div>
 </template>
 
@@ -81,14 +77,14 @@ export default {
                 productName: "", //产品名称
                 drawingNo: "", //图号
                 orderCat: "", //任务类型
-                quantity: "", //数量
+                quantity: 0, //数量
                 remark: "" //备注
             },
             orderForm: {
                 mesCode: "", //订单编号
                 productName: "", //产品名称
                 stage: "", //阶段
-                quantity: "", //数量
+                quantity: 0, //数量
                 planStartTime: "", //计划开始时间
                 planEndTime: "", //计划结束时间
                 splitQuantity: 2, //分解数量
@@ -153,7 +149,7 @@ export default {
             //打开modal层时给订单list赋值
             //alert(JSON.stringify(data))
             this.dataListRetrun.id = data[0].id;
-            this.dataListRetrun.quantity = data[0].quantity;
+            this.dataListRetrun.quantity = Number(data[0].quantity);
             this.dataListRetrun.mesCode = data[0].mesCode;
             this.orderInfo = [];
             this.dataList = [];
@@ -162,7 +158,7 @@ export default {
                 mesCode: this.orderInfo.mesCode, //订单编号
                 productName: this.orderInfo.productName, //产品名称
                 stage: this.orderInfo.stage, //阶段
-                quantity: this.orderInfo.quantity, //数量
+                quantity: Number(this.orderInfo.quantity), //数量
                 planStartTime: this.orderInfo.demandStartDate, //计划开始时间
                 planEndTime: this.orderInfo.demandFinishDate, //计划结束时间
                 splitQuantity: 2, //分解数量
@@ -190,7 +186,7 @@ export default {
                             this.dataList.push({
                                 mesCode: i + 1 < 10 ?
                                     mesCodeSon + "0" + (i + 1) : mesCodeSon + "" + (i + 1),
-                                quantity: "",
+                                quantity: 0,
                                 demandDate: [planStartTime, planEndTime],
                                 demandStartDate: planStartTime,
                                 demandFinishDate: planEndTime
@@ -209,7 +205,7 @@ export default {
             let forDemandStartDate = this.getFormatDate(row.demandDate[0]);
             let forDemandFinishDate = this.getFormatDate(row.demandDate[1]);
             this.dataListRetrun.items[index].mesCode = row.mesCode;
-            this.dataListRetrun.items[index].quantity = row.quantity;
+            this.dataListRetrun.items[index].quantity = Number(row.quantity);
             this.dataListRetrun.items[index].demandStartDate = forDemandStartDate;
             this.dataListRetrun.items[index].demandFinishDate = forDemandFinishDate;
             this.dataList[index].demandDate = [
@@ -220,10 +216,11 @@ export default {
             this.dataList.forEach(el => {
                 splitAmount = Number(splitAmount) + Number(el.quantity)
             })
-            this.amount = this.orderForm.quantity - splitAmount
+            this.amount = Number(this.orderForm.quantity) - splitAmount
+            this.$emit("on-amount", this.amount);
         },
         inputFocus(row, index) {
-            this.amountMax = this.amount + row.quantity
+            this.amountMax = this.amount + Number(row.quantity)
         },
         getFormatDate(dates) {
             const d = new Date(dates);
@@ -259,7 +256,7 @@ export default {
             mesCode: this.orderInfo.mesCode, //订单编号
             productName: "", //产品名称
             stage: "", //阶段
-            quantity: "", //数量
+            quantity: 0, //数量
             planStartTime: "", //计划开始时间
             planEndTime: "", //计划结束时间
             splitQuantity: 2, //分解数量
@@ -275,11 +272,11 @@ export default {
                 this.orderForm.planEndTime = this.orderForm.demandFinishDate;
                 //this.orderForm.splitQuantity = 2;
                 this.dataListRetrun.id = this.orderForm.id;
-                this.dataListRetrun.quantity = this.orderForm.quantity;
+                this.dataListRetrun.quantity = Number(this.orderForm.quantity);
                 this.dataListRetrun.mesCode = this.orderForm.mesCode;
                 this.dataList = []
 
-                this.amount = this.orderForm.quantity
+                this.amount = Number(this.orderForm.quantity)
             }
         }
     }