质量判定--送审

pages/processDesign/ChangeSingle/index.vue

@@ -6,7 +6,6 @@
         <Changesingle />
       </TabPane>
       <TabPane label="不合格审理单" name="unqualifiedorder">
-       
          <unqualifiedorder ref="unqualifiedorder"></unqualifiedorder>
       </TabPane>
       <TabPane label="生产协调单" name="technicalcoordination">

pages/produce/execute/judgment/orderInfos.vue

 <template>
   <div class="detail">
     <Row>
-      <Filed :span="6" :name="l('productName')">{{info.orderInfo.productName}}</Filed>
-      <Filed :span="6" :name="l('drawnNumber')">{{info.orderInfo.drawnNumber}}</Filed>
-      <Filed :span="6" :name="l('status')">{{info.orderInfo.status}}</Filed>
-      <Filed :span="6" :name="l('mesCode')">{{info.orderInfo.mesCode}}</Filed>
-      <Filed :span="6" :name="l('batchNumber')">{{info.orderInfo.batchNumber}}</Filed>
-      <Filed :span="6" :name="l('quantity')">{{info.orderInfo.quantity}}</Filed>
-      <Filed :span="6" :name="l('demandFinishDate')">{{info.orderInfo.demandFinishDate}}</Filed>
-      <Filed :span="6" :name="l('urgencyLevel')">
-        <state code="plan.order.urgencyLevel" :value="info.orderInfo.urgencyLevel+''" type="text"></state>
-      </Filed>
-      <Filed :span="6" :name="l('stage')">
+      <Filed :span="12" :name="l('productName')">{{info.orderInfo.productName}}</Filed>
+      <Filed :span="12" :name="l('drawnNumber')">{{info.orderInfo.drawnNumber}}</Filed>
+      <Filed :span="12" :name="l('status')">{{info.orderInfo.projectNumber}}</Filed>
+      <Filed :span="12" :name="l('mesCode')">{{info.orderInfo.mesCode}}</Filed>
+      <Filed :span="12" name="批次号">{{info.orderInfo.batchNumber}}</Filed>
+      <!-- <Filed :span="8" :name="l('batchNumber')">{{info.orderInfo.batchNumber}}</Filed> -->
+      <Filed :span="12" :name="l('quantity')">{{info.orderInfo.quantity}}</Filed>
+      <Filed :span="12" name="节点日期">{{info.orderInfo.demandFinishDate}}</Filed>
+      <Filed :span="12" name="不合格产品数量">{{info.orderInfo.demandFinishDate}}</Filed>
+      <Filed :span="12" name="问题原因">{{info.orderInfo.demandFinishDate}}</Filed>
+      <Filed :span="12" name="责任归属">{{info.orderInfo.demandFinishDate}}</Filed>
+      <Filed :span="24" name="不合格产品号">{{info.orderInfo.demandFinishDate}}</Filed>
+      <!-- <Filed :span="8" :name="l('stage')">
         <state code="plan.order.stage" :value="info.orderInfo.stage+''" type="text"></state>
       </Filed>
-      <Filed :span="6" :name="l('taskType')">
+      <Filed :span="8" :name="l('taskType')">
         <state code="plan.order.taskType" :value="info.orderInfo.taskType+''" type="text"></state>
       </Filed>
-      <Filed :span="6" :name="l('materialId')">
+      <Filed :span="8" :name="l('materialId')">
         <state code="plan.order.material" :value="info.orderInfo.materialId+''" type="text"></state>
-      </Filed>
+      </Filed> -->
     </Row>
   </div>
 </template>
@@ -47,7 +49,7 @@ export default {
       return name
     },
     l(key) {
-      key = 'orderInfo' + '.' + key
+      key = 'order_list' + '.' + key
       return this.$t(key)
     }
   }

pages/produce/execute/judgment/orderSendReview.vue

 <template>
   <div style="width:80%;margin:0 auto" :style="{ height: divHeight }">
     <OrderInfos v-if="info.status" :info="info"></OrderInfos>
-    <Table
+    <!-- 批量送审展示列表 -->
+    <!-- <Table  :info1="info1"
       :loading="loading"
       border
       :columns="columns1"
       :data="dataList"
       class="tableCommon"
       v-if="osrMoreList"
-    ></Table>
-    <Process
-      ref="userProcess"
-      schemaIdVal="123327da-42b3-41f6-b785-cf933f137a95"
-    />
+    ></Table> -->
+     <Process  ref="userProcess" schemaIdVal="c2e09c9b-02a9-4188-97a6-cdb68d50a64a"/>
   </div>
 </template>
 
@@ -33,17 +31,7 @@ export default {
       osrMoreList: false, //多条数据只显示列表
       info: {
         status: true,
-        orderInfo: []
-      },
-      ruleValidate: {
-        // reviewUser: [
-        //   {
-        //     required: true,
-        //     message: '请选择审批人',
-        //     trigger: 'blur',
-        //     type: 'array'
-        //   }
-        // ]
+        orderInfo: [],
       },
       orderSearchForm: {
         reviewUser: '' //订单名称
@@ -54,93 +42,67 @@ export default {
           key: 'mesCode',
           width: 180,
           tooltip: true
-        },{
+        },
+        {
+          title: '任务类型',
+          key: 'taskType',
+          align: 'center',
+          width: 100,
+          tooltip: true
+        },
+        {
           title: '产品名称',
           key: 'productName',
           tooltip: true
-        },{
-          title: '图号',
-          key: 'drawnNumber',
+        },
+        {
+          title: '阶段',
+          key: 'stage',
           width: 80
-        },{
-          title: '状态',
-          key: 'status',
+        },
+        {
+          title: '材料',
+          key: 'materialId',
           width: 100,
           tooltip: true
-        },{
-          title: '批次号',
-          key: 'batchNumber',
+        },
+        {
+          title: '数量',
+          key: 'quantity',
           align: 'right',
           width: 70
-        },{
-          title: '节点日期',
-          key: 'demandFinishDate',
-          width: 100,
-          tooltip: true
-        },{
-          title: '计划数量',
-          key: 'quantity',
-          width: 100,
-          tooltip: true
-        },
+        }
       ],
       dataList: [],
       dataListRetrun: [], //确定后返回数据
-      dataListRetrunNew: {
-        schemaId: '123327da-42b3-41f6-b785-cf933f137a95', //订单送审的schemaId
-        idList: [], //订单id List
-        codeList: [], //订单编号List
-        operatorIdList: [] //操作员id
-      } //确定后返回数据
+      operatorIdList: [], //操作员id
+      // } //确定后返回数据
     }
   },
   created() {
-    var theight = window.innerHeight - 460 + 'px'
+    var theight = window.innerHeight - 630 + 'px'
     this.divHeight = theight
   },
   mounted() {
-    //this.dataList=;
     window.onresize = () => {
       ///浏览器窗口大小变化
       return (() => {
         window.screenHeight = window.innerHeight
-        this.divHeight = window.screenHeight - 460 + 'px'
+        this.divHeight = window.screenHeight - 630 + 'px'
       })()
     }
   },
   methods: {
     intData(data) {
       //打开modal层时给订单list赋值
-      this.orderInfo = []
-      this.dataList = []
-      this.dataList = data
-      this.osrOneList = false
-      this.osrMoreList = false
-      this.orderSearchForm.reviewUser = ''
-      if (data.length == 1) {
-        this.info.status = true
-        this.info.orderInfo = data[0]
-      } else if (data.length > 1) {
-        this.osrMoreList = true
-        this.info.status = false
-        this.info.orderInfo = []
+      if(data){
+        this.info.Unqualified = data
       }
     },
     returnDataList() {
-      this.dataListRetrunNew.idList = []
-      this.dataListRetrunNew.codeList = []
-      this.dataListRetrunNew.operatorIdList = []
-      this.dataList.forEach((item) => {
-        this.dataListRetrunNew.idList.push(item.id)
-        this.dataListRetrunNew.codeList.push(item.mesCode)
-      })
-      //this.dataListRetrunNew.operatorIdList= this.orderSearchForm.reviewUser
       let ues = this.$refs.userProcess
-      this.dataListRetrunNew.operatorIdList = ues.immutData
-
-      // alert(JSON.stringify( this.dataListRetrunNew))
-      //返回审批数据
-      return this.dataListRetrunNew
+      this.operatorIdList = ues.immutData
+      return this.operatorIdList
     }
   }
 }