examine1 mesplan

pages/handle/examine1/index.vue

 <template>
-  <div style="padding:30px 0">
+<div style="padding:30px 0">
     <Detail :idVal="detailId" />
-    <Process ref="userProcess" :idVal="detailId" :resulstInfo="testObj" @node-click="show"/>
+    <Process ref="userProcess" :idVal="detailId" :resulstInfo="testObj" @node-click="show" />
     <!-- <Footer :idVal="detailId" :footerStatu="footerStatu" @showModalCheckOk='modalCheckOk=true'></Footer> -->
     <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,33 +36,18 @@
             </Row>
         </Form>
     </div>
-    <!-- 订单审里通过form -->
-    <Modal
-      v-model="modalCheckOk"
-      title="订单审里"
-      width="800"
-      :scrollable="true"
-    >
-      <Form :model="formMyCheck" :label-width="100">
+    <!-- 订单审核通过form -->
+    <Modal v-model="modalCheckOk" title="订单审核" width="800" :scrollable="true">
+        <Form :model="formMyCheck" :label-width="100" v-if="false">
             <Row>
                 <Col span="12">
                 <FormItem label="工时：" style="width:100%">
-              <InputNumber
-                v-model="formMyCheck.workHours"
-                :step="1"
-                :min="2"
-                style="width:240px"
-              />
+                    <InputNumber v-model="formMyCheck.workHours" :step="1" :min="2" style="width:240px" />
                 </FormItem>
                 </Col>
                 <Col span="12">
                 <FormItem label="打印周期：" style="width:100%">
-              <InputNumber
-                v-model="formMyCheck.printPeriod"
-                :step="1"
-                :min="2"
-                style="width:240px"
-              />
+                    <InputNumber v-model="formMyCheck.printPeriod" :step="1" :min="2" style="width:240px" />
                 </FormItem>
                 </Col>
             </Row>
@@ -109,17 +64,17 @@
                 </Col>
             </Row>
         </Form>
+        <br />
+        <h4>
+            您确定 <span class="new-red">通过</span> 此订单审批？
+        </h4>
+        <br />
         <div slot="footer">
             <Button @click="modalCheckOk = false">取消</Button>
             <Button type="primary" @click="checkOk" v-show="footerStatue">确定</Button>
         </div>
     </Modal>
-    <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> 此订单审批？
@@ -130,8 +85,9 @@
             <Button type="primary" @click="checkFalse">确定</Button>
         </div>
     </Modal>
-  </div>
+</div>
 </template>
+
 <script>
 import Api from '../api'
 import Detail from './detail'
@@ -156,7 +112,7 @@ export default {
                 rejectToNodeId: null
             },
             modalCheckOk: false,
-      footerStatue:true,
+            footerStatue: true,
             modalCheckNo: false,
             detailId: null,
             statuTitle: '',
@@ -173,31 +129,30 @@ 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') // 加载数据字典
         //  await store.dispatch("loadUsers");//加载缓存的用户
     },
     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)
@@ -205,31 +160,29 @@ export default {
     methods: {
         nextCheckOk() {
             if (this.formMyCheck.radioSp == '通过') {
-        this.footerStatue=true
+                this.footerStatue = true
                 this.modalCheckOk = true
             } else if (this.formMyCheck.radioSp == '驳回') {
                 this.$refs['formValidate'].validate((valid) => {
                     if (valid) {
                         this.modalCheckNo = true
                         this.statuTitle = '驳回'
-          } else {
-          }
+                    } else {}
                 })
             } else {
                 this.$refs['formValidate'].validate((valid) => {
                     if (valid) {
                         this.modalCheckNo = true
                         this.statuTitle = '终止'
-          } else {
-          }
+                    } else {}
                 })
             }
         },
-    show(a){
-      this.footerStatue=false
-      let contextDate=JSON.parse(a.contextData)
-      this.formMyCheck=contextDate
-      this.modalCheckOk=true
+        show(a) {
+            this.footerStatue = false
+            let contextDate = JSON.parse(a.contextData)
+            this.formMyCheck = contextDate
+            this.modalCheckOk = true
 
         },
         getDetailInfos(idVal) {
@@ -241,8 +194,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('加载失败')
@@ -301,12 +254,13 @@ export default {
                 id: this.passId,
                 comment: '',
                 nextOperationIdList: this.nextNodeUserIdList,
-        data: {
-          workHours: this.formMyCheck.workHours,
-          printPeriod: this.formMyCheck.printPeriod,
-          equipment: this.formMyCheck.equipment,
-          materialWeight: this.formMyCheck.materialWeight
-        }
+                data: null,
+                // {
+                // workHours: this.formMyCheck.workHours,
+                // printPeriod: this.formMyCheck.printPeriod,
+                // equipment: this.formMyCheck.equipment,
+                // materialWeight: this.formMyCheck.materialWeight
+                //}
             }
             Api.pass(param).then((r) => {
                 if (r.success) {

pages/mesPlan/detail.vue

 <template>
-  <div class="orderDetail">
+<div class="orderDetail">
     <Row>
         <Col span="8">
         <span class="fwBold">{{l('mesCode')}}</span>
@@ -7,7 +7,9 @@
         </Col>
         <Col span="8">
         <span class="fwBold">{{l('taskType')}}</span>
-        <p> <state code="plan.order.taskType" :value="entity.taskType" type="text"></state></p>
+        <p>
+            <state code="plan.order.taskType" :value="entity.taskType" type="text"></state>
+        </p>
         </Col>
         <Col span="8">
         <span class="fwBold">{{l('quantity')}}</span>
@@ -17,7 +19,9 @@
     <Row>
         <Col span="8">
         <span class="fwBold">{{l('status')}}</span>
-        <p><state code="plan.order.status" :value="entity.status" type="text"></state></p>
+        <p>
+            <state code="plan.order.status" :value="entity.status" type="text"></state>
+        </p>
         </Col>
         <Col span="8">
         <span class="fwBold">{{l('productName')}}</span>
@@ -39,23 +43,47 @@
         </Col>
         <Col span="8">
         <span class="fwBold">{{l('urgencyLevel')}}</span>
-        <p><state code="plan.order.urgencyLevel" :value="entity.urgencyLevel" type="text"></state></p>
+        <p>
+            <state code="plan.order.urgencyLevel" :value="entity.urgencyLevel" type="text"></state>
+        </p>
         </Col>
     </Row>
     <Row>
         <Col span="8">
         <span class="fwBold">{{l('demandStartDate')}}</span>
-        <p><DTSpan type="date" v-model="entity.demandStartDate"></DTSpan></p>
+        <p>
+            <DTSpan type="date" v-model="entity.demandStartDate"></DTSpan>
+        </p>
         </Col>
         <Col span="8">
         <span class="fwBold">{{l('demandFinishDate')}}</span>
-        <p><DTSpan type="date" v-model="entity.demandFinishDate"></DTSpan></p>
+        <p>
+            <DTSpan type="date" v-model="entity.demandFinishDate"></DTSpan>
+        </p>
         </Col>
         <Col span="8">
         <span class="fwBold">{{l('taskRequire')}}</span>
         <p>{{entity.taskRequire}}</p>
         </Col>
     </Row>
+    <Row>
+        <Col span="8">
+        <span class="fwBold">{{l('productingPreparationPeople')}}</span>
+        <p>
+            <WorkShopName v-model="entity.productingPreparationPeople" v-if="entity.productingPreparationPeople>0"></WorkShopName>
+        </p>
+        </Col>
+        <Col span="8">
+        <span class="fwBold">{{l('quotationPeople')}}</span>
+        <p>
+            <User v-model="entity.quotationPeople" v-if="entity.quotationPeople>0"></User>
+        </p>
+        </Col>
+        <Col span="8">
+        <span class="fwBold">&nbsp;</span>
+        <p>&nbsp;</p>
+        </Col>
+    </Row>
     <Row class="lastRow">
         <Col span="24">
         <span class="fwBold">{{l('remark')}}</span>
@@ -63,8 +91,9 @@
         </Col>
     </Row>
 
-  </div>
+</div>
 </template>
+
 <script>
 import Api from "./api";
 export default {
@@ -100,20 +129,21 @@ export default {
     }
 };
 </script>
+
 <style lang="less">
-.orderDetail
-{
+.orderDetail {
     line-height: 30px;
     width: 90%;
     margin: 0 auto;
-  .ivu-row{
+
+    .ivu-row {
         padding-top: 20px;
         padding-bottom: 20px;
-    border-bottom:#ccc solid 1px;
+        border-bottom: #ccc solid 1px;
     }
-  .lastRow
-  {
-     border-bottom:none;
+
+    .lastRow {
+        border-bottom: none;
     }
 }
 </style>