修改下单、工时管理bug

licp

2024-08-02 2941765c75e52229a53d3b711c577da3dfff5e2a

修改下单、工时管理bug

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

@@ -461,6 +461,16 @@
              </div>
            </template>
          </el-table-column>
          <el-table-column prop="tell" label="要求描述" min-width="220px">
            <template slot-scope="scope">
              <el-input size="small" placeholder="要求描述" v-model="scope.row.tell" clearable type="textarea"
                :autosize="{ minRows: 1, maxRows: 3}" @change="e=>requestChange(e,scope.row,'tell')"
                v-if="active==1&&isAskOnlyRead"></el-input>
              <span v-else>
                <template >{{ scope.row.tell }}</template>
              </span>
            </template>
          </el-table-column>
          <el-table-column prop="ask" label="要求值" min-width="220px" v-if="isAskOnlyRead">
            <template slot-scope="scope">
              <el-input size="small" placeholder="要求值" v-model="scope.row.ask" clearable type="textarea"
@@ -477,16 +487,6 @@
                </template>
                <template v-else>{{ scope.row.ask }}</template> -->
                <template >{{ scope.row.ask }}</template>
              </span>
            </template>
          </el-table-column>
          <el-table-column prop="tell" label="要求描述" min-width="220px">
            <template slot-scope="scope">
              <el-input size="small" placeholder="要求描述" v-model="scope.row.tell" clearable type="textarea"
                :autosize="{ minRows: 1, maxRows: 3}" @change="e=>requestChange(e,scope.row,'tell')"
                v-if="active==1&&isAskOnlyRead"></el-input>
              <span v-else>
                <template >{{ scope.row.tell }}</template>
              </span>
            </template>
          </el-table-column>
@@ -961,7 +961,7 @@
          entity: {
            orderBy: {
              field: 'id',
              order: 'asc'
              order: 'desc'
            }
          },
          isIndex: true,
@@ -1370,6 +1370,11 @@
          let obj = this.productList.find(m => m.id == a.id)
          if(obj){
            a.state = obj.state
            a.section = obj.section
            a.ask = obj.ask
            a.manHour = obj.manHour
            a.price = obj.price
            a.tell = obj.tell
          }
        })
      },
@@ -2076,6 +2081,7 @@
          this.sampleIds.push(row.id)
        }
        this.productList = row.insProduct
        this.productList0 = JSON.parse(JSON.stringify(this.productList))
        setTimeout(() => {
          this.productList.forEach(a => {
            if (a.state == 1) this.toggleSelection(a)
@@ -2252,7 +2258,8 @@
            name: this.templateName,
            thing: JSON.stringify({
              addObj: this.addObj,
              sampleList: this.sampleList
              sampleList: this.sampleList,
              selectTree:this.selectTree
            })
          }, {
            headers: {
@@ -2277,6 +2284,7 @@
          let obj = JSON.parse(res.data)
          this.addObj = obj.addObj;
          this.sampleList = obj.sampleList;
          this.selectTree = obj.selectTree
        })
      },
      delSampleAndProduct() {
@@ -2661,25 +2669,31 @@
        }
      },
      upBsmAll (item) {
        let sections = JSON.parse(item.bsmRow.section);
        let asks = JSON.parse(item.bsmRow.ask);
        let tells = JSON.parse(item.bsmRow.tell);
        let manHours = JSON.parse(item.bsmRow.manHour);
        let prices = JSON.parse(item.bsmRow.price);
        for (var a in sections) {
          if (item.bsm1Val === sections[a]) {
            this.productList.forEach(p => {
              if (p.id === item.bsmRow.id) {
                p.section = sections[a]
                p.ask = asks[a]
                p.tell = tells[a]
                p.manHour = manHours[a]
                p.price = prices[a]
              }
            })
            break
        // console.log(1111,item,this.bsm1DiaList)
        for (let i =0;i<this.bsm1DiaList.length;i++){
          this.bsm1DiaList[i].bsm1Val = item.bsm1Val
          let sections = JSON.parse(this.bsm1DiaList[i].bsmRow.section);
          let asks = JSON.parse(this.bsm1DiaList[i].bsmRow.ask);
          let tells = JSON.parse(this.bsm1DiaList[i].bsmRow.tell);
          let manHours = JSON.parse(this.bsm1DiaList[i].bsmRow.manHour);
          let prices = JSON.parse(this.bsm1DiaList[i].bsmRow.price);
          for (var a in sections) {
            if (this.bsm1DiaList[i].bsm1Val === sections[a]) {
              this.productList.forEach(p => {
                if (p.id === this.bsm1DiaList[i].bsmRow.id) {
                  p.section = sections[a]
                  p.ask = asks[a]
                  p.tell = tells[a]
                  p.manHour = manHours[a]
                  p.price = prices[a]
                }
              })
              break
            }
          }
        }
        this.changeProductList0()
        this.currentMethod.insProduct = this.productList0
      },
      beforeClose(done) {
        // if (this.bsm1) {

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

@@ -8,7 +8,7 @@
        <el-radio-button label="workTimeManagement" v-if="selectAuxiliaryOutputWorkingHours">
          日工时管理
        </el-radio-button>
        <el-radio-button label="workTimeConfig" v-if="selectAuxiliaryWorkingHours">
        <el-radio-button label="workTimeConfig" v-if="insertAuxiliaryWorkingHours">
          辅助工时配置
        </el-radio-button>
      </el-radio-group>
@@ -35,7 +35,7 @@
      currentComponent:'workTimeStatistics',
      selectAuxiliaryOriginalHours:false,
      selectAuxiliaryOutputWorkingHours:false,
      selectAuxiliaryWorkingHours:false
      insertAuxiliaryWorkingHours:false
    }
  },
  methods: {
@@ -43,7 +43,7 @@
      let power = JSON.parse(sessionStorage.getItem('power'))
      let selectAuxiliaryOriginalHours = false
      let selectAuxiliaryOutputWorkingHours = false
      let selectAuxiliaryWorkingHours = false
      let insertAuxiliaryWorkingHours = false
      for (var i = 0; i < power.length; i++) {
        if (power[i].menuMethod == 'selectAuxiliaryOriginalHours') {
          selectAuxiliaryOriginalHours = true
@@ -51,18 +51,18 @@
        if (power[i].menuMethod == 'selectAuxiliaryOutputWorkingHours') {
          selectAuxiliaryOutputWorkingHours = true
        }
        if (power[i].menuMethod == 'selectAuxiliaryWorkingHours') {
          selectAuxiliaryWorkingHours = true
        if (power[i].menuMethod == 'insertAuxiliaryWorkingHours') {
          insertAuxiliaryWorkingHours = true
        }
      }
      this.selectAuxiliaryOriginalHours = selectAuxiliaryOriginalHours
      this.selectAuxiliaryOutputWorkingHours = selectAuxiliaryOutputWorkingHours
      this.selectAuxiliaryWorkingHours = selectAuxiliaryWorkingHours
      this.insertAuxiliaryWorkingHours = insertAuxiliaryWorkingHours
      if(this.selectAuxiliaryOriginalHours){
        this.currentComponent = 'workTimeStatistics'
      }else if(this.selectAuxiliaryOutputWorkingHours){
        this.currentComponent = 'workTimeManagement'
      }else if(this.selectAuxiliaryWorkingHours){
      }else if(this.insertAuxiliaryWorkingHours){
        this.currentComponent = 'workTimeConfig'
      }
    }

 src/main.js

@@ -20,7 +20,7 @@
//本地
// Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
// const javaApi = 'http://127.0.0.1:8001';
const javaApi = 'http://192.168.92.249:8001';
const javaApi = 'http://172.20.10.5:8001';

//云
// Vue.prototype.LOCATIONVUE = "http://114.132.189.42:8080";