Merge branch 'master' of ssh://139.186.142.91:29418/productDev/dmMes

Mr.Shi

2023-08-14 5f5f07db32be63e6112ddff7722c1ada10472da5

 web_standard/src/components/ext/OperaPlansDetailExtWindow.vue

@@ -49,7 +49,10 @@
              <span v-else style="color: #03AF76;" class="status-log">{{ item.status==1 ? '已备料' : item.status==2 ? '已完工' : item.status==3 ? '已检验' : '已报工' }}</span>
            </div>
          </div>
          <div style="color: #777; font-size: 11px; margin-bottom: 15px;">{{ '生产人员：' + proUserStr(item) }}</div>
          <div class="c3 mt10 mb10 f12" style="display: flex;">
            <div>计划数量：{{ form.num }}</div>
            <div class="ml10">计划开工日期：{{ form.num }}</div>
          </div>
          <div v-if="item.produceDate" class="order-setup">
            <!-- 报工信息 -->
            <div class="line-style">
@@ -59,23 +62,20 @@
            </div>
            <div class="setup-content">
              <div class="left-message">
                <div class="message-title-temp">
                  产出
                </div>
                <p class="time-style">
                  {{ item.produceDate }}
                </p>
                <div class="message-title-temp">产出</div>
              </div>
              <div class="right-message">
                <div style="margin-left: 30px">
                  <span style="color:#666;">物料：</span>
              <div class="right-message ml30">
                <div style="display: flex;">
                  <div class="time-style">操作人：{{ item.createUserName }}</div>
                  <div class="time-style ml50">操作时间：{{ item.produceDate }}</div>
                </div>
                <div>
                <div style="display: flex;" class="mt10">
                  <span style="color:#666;">产品：</span>
                  <div v-if="item.qualifiedNum">
                    <span style="color:#03AF76">[合格品] </span>
                    <span style="color:#333333">{{ item.qualifiedNum + (form.umodel && form.umodel.name) }}</span>
                  </div>
                  <div v-if="item.unqualifiedNum">
                  <div v-if="item.unqualifiedNum" class="ml20">
                    <span style="color:#F5A400">[不良品] </span>
                    <span style="color:#333333">{{ item.unqualifiedNum + (form.umodel && form.umodel.name) }}</span>
                  </div>
@@ -95,17 +95,18 @@
                <div :class="item.produceDate ? 'message-title' : 'message-title-temp'">
                  投料
                </div>
                <p class="time-style">
                  {{ item.materialDate }}
                </p>
              </div>
              <div class="right-message">
                <div style="margin-left: 30px">
                  <span style="color:#666;">物料：</span>
              <div class="right-message ml30">
                <div style="display: flex;">
                  <div class="time-style">操作人：{{ item.createUserName }}</div>
                  <div class="time-style ml50">操作时间：{{ item.materialDate }}</div>
                </div>
                <div>
                  <div v-for="(sItem, sIndex) in item.materialList" :key="sIndex">
                    <span style="color:#333333">{{ sItem.name + ' / ' + sItem.num + sItem.unitName }}</span>
                <div style="display: flex" class="mt10">
                  <div style="color:#666;">物料：</div>
                  <div>
                    <div v-for="(sItem, sIndex) in item.materialList" :key="sIndex">
                      <span style="color:#333333">{{ sItem.name + ' / ' + sItem.num + sItem.unitName }}</span>
                    </div>
                  </div>
                </div>
              </div>
@@ -122,17 +123,17 @@
                <div :class="item.materialDate ? 'message-title' : 'message-title-temp'">
                  分配
                </div>
                <p class="time-style">
                  {{ item.distributeDate }}
                </p>
               
              </div>
              <div class="right-message">
                <div style="margin-left: 30px">
                  <span style="color:#666;">分配数量：</span>
              <div class="right-message ml30">
                <div style="display: flex;">
                  <div class="time-style">操作人：{{ item.createUserName }}</div>
                  <div class="time-style ml50">操作时间：{{ item.distributeDate }}</div>
                </div>
                <div>
                  <span style="color:#333333">{{ item.planNum + (form.umodel && form.umodel.name) }}</span>
                <div class="mt10">
                  <span style="color:#666;">分配数量：{{ item.planNum + (form.umodel && form.umodel.name) }}</span>
                </div>
                
              </div>
            </div>
          </div>
@@ -341,9 +342,9 @@
      flex: 1;
      // background-color: #f7f7f7;
      display: flex;
      justify-content: space-between;
      .left-message {
        width: 62px;
        display: flex;
        line-height: 20px;
        .message-title {
          color: #333;
          font-weight: 500;
@@ -356,14 +357,11 @@
        }
        .time-style {
          color: #999999;
          font-size: 11px;
          max-lines: 2;
        }
      }
      .right-message {
        flex: 1;
        font-size: 13px;
        display: flex;
        // display: flex;
        flex-direction: row;
      }
    }