Merge branch 'dev' of ssh://139.186.142.91:29418/productDev/dmMes into dev

Mr.Shi

2023-09-05 16cd5600efc6f94ed617cb09e1a2dd579017ddef

 minipro_standard/components/workOrderInfo.vue

@@ -2,7 +2,7 @@
   <view class="p30 bg_w order-info">

      <view class="bX">

         <view class="cY">

            <view class="mr10 b">墙体砖｜码垛</view>

            <view class="mr10 b">{{ `${orederMessage.mmodel.name} |${orederMessage.procedureName}`}}</view>

            <u-tag size="mini" bgColor="#03AF76" text="正常"></u-tag>

         </view>

         <view class="status" :class="orederMessage.status==0?'wc':orederMessage.status==1?'green':orederMessage.status==3?'blue':orederMessage.status==7?'green':'c6'">{{ stausToStr(1) }}</view>

@@ -11,28 +11,28 @@
      <view class="mt20 bg_f7 ptb20 plr30 n">
         <view class="c2 mb20">
            <span class="c6">物料编码：</span>
            {{ orederMessage.mmodel ? orederMessage.mmodel.code : '03K-0K-0-1' }}
            {{ orederMessage.mmodel ? orederMessage.mmodel.code : '-' }}
         </view>
         <view class="c2 mb20">
            <span class="c6">计划开工：</span>
            {{ orederMessage.planDate || '2022/01/11' }}
            {{ orederMessage.planDate || '-' }}
         </view>
         <view class="c2 mb20">
            <span class="c6">生产批次：</span>
            {{ orederMessage.batch || 'PH20221023001' }}
            {{ orederMessage.batch || '-' }}
         </view>
         <view class="c2 mb20">
            <span class="c6">计划数量：</span>
            {{ orederMessage.planNum || '1000' }}{{ orederMessage.umodel ? orederMessage.umodel.name : 'A1' }}
            {{ orederMessage.planNum || '-' }}{{ orederMessage.umodel ? orederMessage.umodel.name : '-' }}
         </view>
         <view class="c2 mb20">
            <span class="c6">生产设备：</span>
            {{ orederMessage.pgmodel ? `${orederMessage.pgmodel.code} - ${orederMessage.pgmodel.name}` : 'A1' }}
            {{ orederMessage.pgmodel ? `${orederMessage.pgmodel.code} - ${orederMessage.pgmodel.name}` : '-' }}
         </view>
         <view class="c2 flex">
            <view class="c6" style="flex-shrink: 0;">生产人员：</view>
            <view class="flex1">
               {{ orederMessage.proUserList ? orederMessage.proUserList.map(item => item.proUserDepartName).join(' / ') : '侯泽慧-和县飞骏新型建材' }}
               {{ orederMessage.proUserList ? orederMessage.proUserList.map(item => item.proUserDepartName).join(' / ') : '-' }}
            </view>
         </view>
      </view>

@@ -43,7 +43,10 @@
   export default {

      name: "workOrderInfo",
      props: {
         orederMessage: {}
         orederMessage: {
            type: Object,
            default: () => {}
         }
      },

      data() {

         return {