合并冲突

licp

2024-07-17 b570615eb2c3e1c5f3f2a3dc046d00a64fc2a39e

合并冲突

 src/components/do/b1-ins-order/add.vue

@@ -840,6 +840,21 @@
        <el-button type="primary" @click="spliceData">保存</el-button>
      </span>
    </el-dialog>
    <el-dialog :title="temperatureTitle" :visible.sync="temperatureShow" width="260px" :before-close="temperatureShowClose" :show-close="false">
      <div>
        <div v-if="isShowInput" style="margin-bottom: 6px">
          <span>循环次数:</span>
          <el-input size="small" type="number" v-model="temperatureTestNum" style="width: 120px"></el-input>
        </div>
        <el-checkbox-group v-model="temperatureTest" @change="handleTemperatureTestChange" style="display: flex;flex-direction: column;">
          <el-checkbox v-for="item in temperatureList" :label="item" :key="item" style="margin-bottom: 6px">{{item}}</el-checkbox>
        </el-checkbox-group>
      </div>
      <span slot="footer" class="dialog-footer">
        <el-button @click="cleanTemperatureTest">取消</el-button>
        <el-button type="primary" @click="spliceTemperatureTest">保存</el-button>
      </span>
    </el-dialog>
  </div>
</template>

@@ -1027,7 +1042,15 @@
          {label: '=', value: '='},
          {label: '≥', value: '≥'},
          {label: '>', value: '>'},
        ]
        ],
        temperatureShow: false, // 温升试验检验项弹框
        temperatureTest: [],
        temperatureList: [],
        temperatureEngList: [],
        temperatureTitle: '',
        temperatureTestNum: '',
        isShowInput: false,
        temId: ''
      }
    },
    watch: {
@@ -1169,9 +1192,61 @@
            item.tell = tell
          }
        })
        console.log('ask---', ask)
        console.log('tell---', tell)
        this.circulateShow = false
      },
      spliceTemperatureTest () {
        if (this.temperatureTest.length === 0) {
          this.$message.error('请选择')
          return
        }
        let askStr = ''
        let askArr1 = []
        let askArr2 = ''
        let ask = ''
        let index = ''
        this.temperatureTest.map(val => {
          index = this.temperatureEngList.findIndex(item => item.label === val)
          if (index > -1) {
            askStr = val + ',' + this.temperatureEngList[index].value
          }
          askArr1.push(askStr)
        })

        if (this.temperatureTitle === '温升试验要求填写') {
          askArr2 = askArr1.join(';')
          ask = askArr2 + ';1'
        } else {
          if (!this.temperatureTestNum) {
            this.$message.error('请填写循环次数')
            return
          }
          askArr2 = askArr1.join(';')
          ask = askArr2 + ';' + this.temperatureTestNum
        }
        this.productList.forEach(item => {
          if (item.id === this.temId) {
            item.ask = ask
            item.tell = ask
          }
        })
        console.log('ask---', ask)
        this.temperatureShow = false
      },
      temperatureShowClose () {
        if (this.temperatureTitle === '热循环要求填写' && !this.temperatureTestNum) {
          this.$message.error('请填写循环次数')
          return
        }
        if (this.temperatureTest.length === 0) {
          this.$message.error('请选择')
          return
        }
        this.spliceTemperatureTest()
      },
      cleanTemperatureTest () {
        this.temperatureTest = []
        this.temperatureTestNum = ''
        this.temperatureShow = false
      },
      cleanSpliceData () {
        this.circulateForm.entrustNum = null
@@ -1200,6 +1275,10 @@
            }
          })
          this.spliceData()
      },

      handleTemperatureTestChange (value) {
        console.log('value---', value)
      },
      handleSelectionChange(val) {
        this.opticalProjectList = val;
@@ -1989,6 +2068,16 @@
        } else if (row.inspectionItem === '温度循环' && select[2] === '光缆' && row.state === 0) {
          this.circulateShow = false;
        }
        if ((row.inspectionItem === '温升试验' || row.inspectionItem === '热循环') && row.state === 1) {
          console.log('row---', row)
          this.temperatureTitle = `${row.inspectionItem}要求填写`
          this.isShowInput = row.inspectionItem === '热循环'
          this.temId = row.id
          this.temperatureShow = true;
          return
        } else if ((row.inspectionItem === '温升试验' || row.inspectionItem === '热循环') && row.state === 0) {
          this.temperatureShow = false;
        }
        this.getProNum()
      },
      searchProject () {
@@ -2160,6 +2249,20 @@
          }, 200)
        })
        this.searchProject()
        this.searchTemList()
      },
      searchTemList () {
        this.temperatureList = []
        this.$axios.post(this.$api.enums.selectEnumByCategory, {
          category: "电力温度循环检验"
        }).then(res => {
          if (res.data.length > 0) {
            this.temperatureEngList = res.data
            res.data.forEach(item => {
              this.temperatureList.push(item.label)
            })
          }
        })
      },
      changeModel() {
        this.sampleList.forEach(a => {
@@ -2219,6 +2322,7 @@
        }
      },
      handleAll(e) {
        console.log('e---', e)
        if (e.length > 0) {
          this.productList.map(m => {
            if(e.find(a=>a.id == m.id)){
@@ -2260,6 +2364,23 @@
            this.$refs.productTable.clearSelection()
            return
          }
          const select = this.selectTree.split(' - ')
          if (p.inspectionItem === '温度循环' && select[2] === '光缆' && p.state === 1) {
            this.circulateShow = true;
            return
          } else if (p.inspectionItem === '温度循环' && select[2] === '光缆' && p.state === 0) {
            this.circulateShow = false;
          }
          if ((p.inspectionItem === '温升试验' || p.inspectionItem === '热循环') && p.state === 1) {
            console.log('p---', p)
            this.temperatureTitle = `${p.inspectionItem}要求填写`
            this.isShowInput = p.inspectionItem === '热循环'
            this.temId = p.id
            this.temperatureShow = true;
            return
          } else if ((p.inspectionItem === '温升试验' || p.inspectionItem === '热循环') && p.state === 0) {
            this.temperatureShow = false;
          }
          /* if (p.ask.includes('RTS')&&p.state === 1) {
            p.rts = ''
            this.bsm3Val = ''

 src/components/do/b3-work-time-management/work-time-management.vue

@@ -217,7 +217,9 @@
  },
  data () {
    return{
      entity:{},
      entity:{
        dateTime: []
      },
      down:false,
      add:false,
      componentData: {
@@ -341,13 +343,13 @@
      entityCopy1: {},
      upIndex1:100,
      weekList:[
        {label: '星期一', value: '1',type:'primary'},
        {label: '星期二', value: '2',type:'primary'},
        {label: '星期三', value: '3',type:'primary'},
        {label: '星期四', value: '4',type:'primary'},
        {label: '星期五', value: '5',type:'primary'},
        {label: '星期六', value: '6',type:'primary'},
        {label: '星期日', value: '7',type:'primary'}
        {label: '周一', value: '1',type:'primary'},
        {label: '周二', value: '2',type:'primary'},
        {label: '周三', value: '3',type:'primary'},
        {label: '周四', value: '4',type:'primary'},
        {label: '周五', value: '5',type:'primary'},
        {label: '周六', value: '6',type:'primary'},
        {label: '周日', value: '7',type:'primary'}
      ],
      currentTable:'ValueTable0',
      addVisible:false,
@@ -454,6 +456,9 @@
      }
    }
  },
  created() {
    this.setDate()
  },
  mounted(){
    this.getCurrentWeekNumber()
    this.selectEnumByCategory()
@@ -466,6 +471,17 @@
    this.getPower()
  },
  methods:{
    /** 将时间选择器默认选为当天的日期 */
    setDate(){
      let currentDate = new Date();
      let year = currentDate.getFullYear();
      let month = String(currentDate.getMonth() + 1).padStart(2, '0');
      let day = String(currentDate.getDate()).padStart(2, '0');
      let formattedDate1 = `${year}-${month}-${day} 00:00:00`;
      let formattedDate2 = `${year}-${month}-${day} 23:59:59`;
      this.entity.dateTime.push(formattedDate1);
      this.entity.dateTime.push(formattedDate2);
    },
    getPower(){
      let power = JSON.parse(sessionStorage.getItem('power'))
        let del = false

 src/components/view/b1-inspection-order.vue

@@ -372,7 +372,7 @@
        </el-row>
      </span>
    </el-dialog>
    <div class="el-dialog__body" style="overflow-y: auto;position: absolute;margin-top: 0;position: fixed;top: 999px;z-index: 99999;">
    <div class="el-dialog__body" style="display:none;overflow-y: auto;margin-top: 0;position: fixed;top: 999px;z-index: 99999;">
        <div id="printMOrder">
          <el-card class="box-card" v-for="(item, i) in checkDataList" :key="i" style="font-size: 8px !important;page-break-after: always;color: #000;box-shadow: none;" >
            <div style="display: flex;">