value
2024-05-08 e6fe82af9539b07f182b1d719a86059ebfebabb7
区间项目下单
已修改3个文件
156 ■■■■ 文件已修改
src/components/do/b1-ins-order/add.vue 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/view/a5-capacity-scope.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/view/b2-standard.vue 122 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/do/b1-ins-order/add.vue
@@ -270,10 +270,17 @@
        <el-table-column prop="model" label="样品型号" align="center" min-width="100">
          <template slot-scope="scope">
            <el-select v-model="scope.row.model" filterable allow-create default-first-option placeholder="样品型号"
              size="small" @change="handleChangeModel" :disabled="active>1">
              size="small" @change="handleChangeModel" :disabled="active>1" style="width: 100%;" disabled>
              <el-option v-for="item in models" :key="item.value" :label="item.label" :value="item.value">
              </el-option>
            </el-select>
          </template>
        </el-table-column>
        <el-table-column prop="modelNum" label="型号参数" width="130" align="center" v-if="!(active>1)">
          <template slot-scope="scope">
            <el-input size="small" v-model="scope.row.modelNum" clearable placeholder="非必填"
              @keyup.enter.native="methodChange(scope.row.standardMethodListId, scope.row)"
              @clear="methodChange(scope.row.standardMethodListId, scope.row)"></el-input>
          </template>
        </el-table-column>
        <el-table-column prop="standardMethodListId" label="检验标准" align="center" min-width="100">
@@ -334,7 +341,7 @@
        <el-table-column prop="unit" label="计量单位" width="100" show-overflow-tooltip></el-table-column>
        <el-table-column prop="price" label="单价" width="100" show-overflow-tooltip></el-table-column>
        <el-table-column prop="manDay" label="预计时间(天)" width="120" show-overflow-tooltip></el-table-column>
        <el-table-column prop="manHourGroup" label="工时分组" width="100" show-overflow-tooltip></el-table-column>
        <el-table-column prop="manHour" label="工时系数" width="100" show-overflow-tooltip></el-table-column>
        <!-- <el-table-column prop="deviceGroup" label="设备组" width="120" show-overflow-tooltip></el-table-column> -->
        <el-table-column prop="section" label="区间" width="120" show-overflow-tooltip></el-table-column>
        <el-table-column prop="ask" label="要求值" min-width="220px">
@@ -370,7 +377,7 @@
            <el-row>
              <el-col :span="24">
                <span><i
                    :class="`node_i ${data.children != undefined ? 'el-icon-folder-opened' : 'el-icon-tickets'}`"></i>
                    :class="`node_i ${data.children != undefined ? (data.code==='[1]'?'el-icon-folder-opened':'el-icon-folder') : 'el-icon-tickets'}`"></i>
                  {{ data.code }} {{ data.label }}</span>
              </el-col>
            </el-row>
@@ -562,6 +569,7 @@
          sampleType: null,
          sample: null,
          model: null,
          modelNum: null,
          sampleNum: 1,
          isLeave: 0,
          unit: null
@@ -722,7 +730,10 @@
          this.saveLoad = true
          this.$axios.post(this.$api.insOrder.addInsOrder, {
            insOrder: this.addObj,
            list: JSON.stringify(this.sampleList)
            list: JSON.stringify(this.sampleList.map(a=>{
              a.model = a.model + ((a.modelNum==null||a.modelNum==''||a.modelNum=='null')?'':('-'+a.modelNum))
              return a
            }))
          }, {
            headers: {
              'Content-Type': 'application/json'
@@ -847,9 +858,7 @@
        this.$axios.get(this.$api.standardTree.selectStandardTreeList).then(res => {
          this.list = res.data
          this.list.forEach(a => {
            a.children.forEach(b => {
              this.expandedKeys.push(b.label)
            })
            this.expandedKeys.push(a.label)
          })
        })
      },
@@ -1114,9 +1123,10 @@
        })
      },
      methodChange(val, row) {
        if(val===null||val==='')return
        this.getProductLoad = true
        this.$axios.post(this.$api.standardTree.selectStandardProductList, {
          model: this.addObj.model,
          model: this.addObj.model + '-' + row.modelNum,
          standardMethodListId: val
        }, {
          headers: {
src/components/view/a5-capacity-scope.vue
@@ -228,11 +228,11 @@
              multiple: true
            }
          },
          requiredAdd: ['sonLaboratory', 'inspectionItem', 'manHour', 'inspectionItemType', 'inspectionValueType',
            'unit', 'method', 'price', 'manDay', 'templateId'
          requiredAdd: ['sonLaboratory', 'inspectionItem', 'inspectionItemType', 'inspectionValueType',
            'unit', 'method', 'manDay', 'templateId'
          ],
          requiredUp: ['sonLaboratory', 'inspectionItem', 'manHour', 'inspectionItemType', 'inspectionValueType',
            'unit', 'method', 'price', 'manDay', 'templateId'
          requiredUp: ['sonLaboratory', 'inspectionItem', 'inspectionItemType', 'inspectionValueType',
            'unit', 'method', 'manDay', 'templateId'
          ]
        },
        testObjectData: {
src/components/view/b2-standard.vue
@@ -116,7 +116,7 @@
          <el-row style="width: 100%;">
            <el-col :span="21" :class="{sort:node.level>3}" :title="data.label">
              <span><i
                  :class="`node_i ${data.children != undefined ? 'el-icon-folder-opened' : 'el-icon-tickets'}`"></i>
                  :class="`node_i ${data.children != undefined ? (data.code==='[1]'?'el-icon-folder-opened':'el-icon-folder') : 'el-icon-tickets'}`"></i>
                {{ data.code }} {{ data.label }}</span>
            </el-col>
            <el-col :span="2" style="text-align: right;" v-if="delStandardTree">
@@ -142,8 +142,8 @@
        <!-- </el-col> -->
      </el-row>
      <el-row class="standard_table" v-loading="tableLoad">
        <el-table class="el-table" :data="standardList" style="width: 100%;" height="220"
          tooltip-effect="dark" highlight-current-row @row-click="rowClick" ref="standard">
        <el-table class="el-table" :data="standardList" style="width: 100%;" height="220" tooltip-effect="dark"
          highlight-current-row @row-click="rowClick" ref="standard">
          <el-table-column prop="code" label="标准编号" show-overflow-tooltip width="200">
            <template slot-scope="scope">
              <span style="color: red;font-size: 14px;">{{scope.row['code']}}</span>
@@ -199,8 +199,22 @@
            </template>
          </el-table-column>
          <el-table-column prop="unit" label="计量单位" width="100" show-overflow-tooltip></el-table-column>
          <el-table-column prop="price" label="单价(元)" width="90" show-overflow-tooltip></el-table-column>
          <el-table-column prop="manHour" label="工时(H)" width="90" show-overflow-tooltip></el-table-column>
          <el-table-column prop="price" label="单价(元)" width="120">
            <template slot-scope="scope">
              <el-input v-model="scope.row.price" size="small" placeholder="单价(元)"
                @change="(value)=>upStandardProductListOfPrice(value,scope.row.id)" v-if="upStandardProduct">
              </el-input>
              <span v-else>{{scope.row.price}}</span>
            </template>
          </el-table-column>
          <el-table-column prop="manHour" label="工时系数" width="120">
            <template slot-scope="scope">
              <el-input v-model="scope.row.manHour" size="small" placeholder="单价(元)"
                @change="(value)=>upStandardProductListOfManHour(value,scope.row.id)" v-if="upStandardProduct">
              </el-input>
              <span v-else>{{scope.row.manHour}}</span>
            </template>
          </el-table-column>
          <el-table-column prop="manHourGroup" label="工时分组" width="100" show-overflow-tooltip></el-table-column>
          <el-table-column prop="section" label="区间" width="120" show-overflow-tooltip></el-table-column>
          <el-table-column prop="section" label="操作" width="120">
@@ -278,19 +292,41 @@
        <el-button type="primary" @click="addStandardProductDo" :loading="addLoad3">确 定</el-button>
      </span>
    </el-dialog>
    <el-dialog title="区间设置" :visible.sync="sectionUpDia" width="500px">
    <el-dialog title="区间设置" :visible.sync="sectionUpDia" width="70%">
      <div class="body" style="padding: 5px 0;">
        <el-table :data="sectionList" border style="width: 100%" height="350px">
          <el-table-column type="index" label="序号" width="70" align="center">
          </el-table-column>
          <el-table-column label="区间" align="center">
            <template slot-scope="scope">
              <el-input size="small" v-model="scope.row.thing" clearable></el-input>
              <el-input size="small" v-model="scope.row.thing" clearable placeholder="区间"></el-input>
            </template>
          </el-table-column>
          <el-table-column label="要求值" align="center">
            <template slot-scope="scope">
              <el-input size="small" v-model="scope.row.ask" clearable placeholder="要求值"></el-input>
            </template>
          </el-table-column>
          <el-table-column label="要求描述" align="center">
            <template slot-scope="scope">
              <el-input size="small" placeholder="要求描述" v-model="scope.row.tell" clearable type="textarea"
                :autosize="{ minRows: 1, maxRows: 2}"></el-input>
            </template>
          </el-table-column>
          <el-table-column label="单价" align="center" width="120">
            <template slot-scope="scope">
              <el-input size="small" v-model="scope.row.price" clearable placeholder="单价"></el-input>
            </template>
          </el-table-column>
          <el-table-column label="工时系数" align="center" width="120">
            <template slot-scope="scope">
              <el-input size="small" v-model="scope.row.manHour" clearable placeholder="工时系数"></el-input>
            </template>
          </el-table-column>
          <el-table-column label="操作" width="70" align="center">
            <template slot-scope="scope">
              <el-button size="mini" type="danger" icon="el-icon-minus" circle @click="sectionList.splice(scope.$index, 1)"></el-button>
              <el-button size="mini" type="danger" icon="el-icon-minus" circle
                @click="sectionList.splice(scope.$index, 1)"></el-button>
            </template>
          </el-table-column>
        </el-table>
@@ -739,7 +775,39 @@
            this.$message.error('未保存')
            return
          }
          this.$message.success('已保存')
          // this.$message.success('已保存')
        })
      },
      upStandardProductListOfPrice(value, index) {
        this.$axios.post(this.$api.standardTree.upStandardProductList, {
          id: index,
          price: value
        }, {
          headers: {
            'Content-Type': 'application/json'
          }
        }).then(res => {
          if (res.code == 201) {
            this.$message.error('未保存')
            return
          }
          // this.$message.success('已保存')
        })
      },
      upStandardProductListOfManHour(value, index) {
        this.$axios.post(this.$api.standardTree.upStandardProductList, {
          id: index,
          manHour: value
        }, {
          headers: {
            'Content-Type': 'application/json'
          }
        }).then(res => {
          if (res.code == 201) {
            this.$message.error('未保存')
            return
          }
          // this.$message.success('已保存')
        })
      },
      delStandardMethodByFLSSM(id) {
@@ -876,26 +944,54 @@
        this.sectionRow = row
        this.sectionUpDia = true
        this.sectionList = []
        if(this.sectionRow.section!==null){
          JSON.parse(this.sectionRow.section).forEach(a=>{
        if (this.sectionRow.section != null && this.sectionRow.section != '') {
          JSON.parse(this.sectionRow.section).forEach((a, ai) => {
            this.sectionList.push({
              thing: a
              thing: a,
              ask: JSON.parse(this.sectionRow.ask)[ai],
              tell: JSON.parse(this.sectionRow.tell)[ai],
              price: JSON.parse(this.sectionRow.price)[ai],
              manHour: JSON.parse(this.sectionRow.manHour)[ai]
            })
          })
        }
      },
      sectionLoadAdd() {
        let sectionList = []
        let askList = []
        let tellList = []
        let priceList = []
        let manHourList = []
        this.sectionList.forEach(a=>{
          if(a.thing!==''){
            sectionList.push(a.thing)
            askList.push(a.ask)
            tellList.push(a.tell)
            priceList.push(a.price)
            manHourList.push(a.manHour)
          }
        })
        if (sectionList.length === 0) {
          this.sectionRow.section = null
          this.sectionRow.ask = null
          this.sectionRow.tell = null
          this.sectionRow.price = null
          this.sectionRow.manHour = null
        } else {
        this.sectionRow.section = JSON.stringify(sectionList)
          this.sectionRow.ask = JSON.stringify(askList)
          this.sectionRow.tell = JSON.stringify(tellList)
          this.sectionRow.price = JSON.stringify(priceList)
          this.sectionRow.manHour = JSON.stringify(manHourList)
        }
        this.sectionLoad = true
        this.$axios.post(this.$api.standardTree.upStandardProductList, {
          id: this.sectionRow.id,
          section: this.sectionRow.section
          section: this.sectionRow.section,
          ask: this.sectionRow.ask,
          tell: this.sectionRow.tell,
          price: this.sectionRow.price,
          manHour: this.sectionRow.manHour
        }, {
          headers: {
            'Content-Type': 'application/json'