费用统计增加时间段搜索；检验单增加搜索条件

value

2024-05-01 aa5806c27f2e9af6600a2fce871ebe6a28cc183b

费用统计增加时间段搜索；检验单增加搜索条件

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

@@ -286,13 +286,13 @@
            </el-select>
          </template>
        </el-table-column>
        <el-table-column prop="unit" label="单位" align="center" min-width="100">
        <!-- <el-table-column prop="unit" label="单位" align="center" min-width="100">
          <template slot-scope="scope">
            <el-select v-model="scope.row.unit" clearable size="small" style="width: 100%;" :disabled="active>1">
              <el-option v-for="(a, i) in units" :key="i" :label="a.label" :value="a.value"></el-option>
            </el-select>
          </template>
        </el-table-column>
        </el-table-column> -->
        <!-- <el-table-column prop="isLeave" label="是否留样" align="center" min-width="100">
          <template slot-scope="scope">
            <el-select v-model="scope.row.isLeave" size="small" :disabled="active>1">
@@ -718,8 +718,6 @@
          this.$message.error('请输入样品型号')
        } else if (!this.sampleList.every(m => m.standardMethodListId)) {
          this.$message.error('请选择检验标准')
        } else if (!this.sampleList.every(m => m.unit)) {
          this.$message.error('请输入样品的单位')
        } else {
          this.saveLoad = true
          this.$axios.post(this.$api.insOrder.addInsOrder, {

 src/components/tool/value-table.vue

@@ -156,7 +156,7 @@
        :total="total">
      </el-pagination>
    </div>
    <el-dialog title="编辑" :visible.sync="upDia" :width="data.row==1?'500px':500+data.row * 200 + 'px'" append-to-body>
    <el-dialog title="编辑" :visible.sync="upDia" :width="data.row==1?'500px':540+data.row * 200 + 'px'" append-to-body>
      <div class="body" style="max-height: 550px;overflow-y: auto;padding: 5px 10px 5px 0;">
        <div v-if="data.row > 1">
          <div v-for="(a, ai) in upHead" :key="ai" style="line-height: 50px;">
@@ -225,7 +225,7 @@
        <el-button type="primary" @click="saveUpData" :loading="upLoad">确 定</el-button>
      </span>
    </el-dialog>
    <el-dialog title="新增" :visible.sync="addDia" :width="data.row==1?'500px':500+data.row * 200 + 'px'" append-to-body>
    <el-dialog title="新增" :visible.sync="addDia" :width="data.row==1?'500px':540+data.row * 200 + 'px'" append-to-body>
      <div class="body" v-if="addDia" style="max-height: 550px;overflow-y: auto;padding: 5px 10px 5px 0;">
        <div v-if="data.row > 1">
          <div v-for="(a, ai) in upHead" :key="ai" style="line-height: 50px;">

 src/components/view/a5-capacity-scope.vue

@@ -229,10 +229,10 @@
            }
          },
          requiredAdd: ['sonLaboratory', 'inspectionItem', 'manHour', 'inspectionItemType', 'inspectionValueType',
            'unit', 'method', 'price', 'manDay'
            'unit', 'method', 'price', 'manDay', 'templateId'
          ],
          requiredUp: ['sonLaboratory', 'inspectionItem', 'manHour', 'inspectionItemType', 'inspectionValueType',
            'unit', 'method', 'price', 'manDay'
            'unit', 'method', 'price', 'manDay', 'templateId'
          ]
        },
        testObjectData: {

 src/components/view/b1-expenses.vue

@@ -59,14 +59,9 @@
        <div class="search_thing">
                    <div class="search_label">时间范围：</div>
                    <div class="search_input">
            <el-date-picker
              v-model="dates"
              type="datetimerange"
              range-separator="至"
              format="yyyy-MM-dd HH:mm:ss"
              start-placeholder="开始日期"
              end-placeholder="结束日期"
              size="small">
            <el-date-picker v-model="dates" type="daterange" range-separator="至" format="yyyy-MM-dd"
              value-format="yyyy-MM-dd" start-placeholder="开始日期" end-placeholder="结束日期" size="small"
              @change="datesChange" :key="index2">
            </el-date-picker>
          </div>
                </div>
@@ -81,8 +76,8 @@
                </div>
            </div>
            <div class="table">
                <ValueTable ref="ValueTable" :url="$api.insOrder.costStatistics" :componentData="componentData"
                    :key="upIndex" @handleWeave="handleWeave"/>
        <ValueTable ref="ValueTable" :url="$api.insOrder.costStatistics" :componentData="componentData" :key="upIndex"
          @handleWeave="handleWeave" />
            </div>
        </div>
    <el-dialog title="在线编制" :visible.sync="claimVisible" width="70%" :modal-append-to-body="false">
@@ -108,11 +103,13 @@
                componentData: {
                    entity: {
                        name: null,
            dates: null,
                        orderBy: {
                            field: 'id,ins_sample_id',
                            order: 'asc'
                        }
                    },
          init: false,
                    isIndex: true,
                    showSelect: false,
                    select: false,
@@ -121,8 +118,7 @@
                    linkEvent:{},
          spanConfig:{
            //合并行
            rows:[
              {
            rows: [{
                name:'createTime',
                index:1
              },
@@ -142,8 +138,7 @@
            // 特殊的合并行，根据main和rows的name来合并
            special:{
              main:'insSampleId',
              rows:[
                {
              rows: [{
                  name:'sample',
                  index:3
                },
@@ -189,19 +184,42 @@
                entityCopy: {},
                upIndex: 0,
        claimVisible:false,
                dates: []
        dates: [],
        index2: 0
            }
        },
        mounted() {
      this.getDates()
      this.refreshTable()
            this.entityCopy = this.HaveJson(this.componentData.entity)
            this.getPower()
        },
        methods: {
      getDates(){
        //当前月第一天
        var y = new Date().getFullYear(); //获取年份
        var m = new Date().getMonth() + 1; //获取月份
        var d = "01";
        m = m < 10 ? "0" + m : m; //月份补 0
        let startDate = [y, m, d].join("-");
        //当前月最后一天
        var y = new Date().getFullYear(); //获取年份
        var m = new Date().getMonth() + 1; //获取月份
        var d = new Date(y, m, 0).getDate(); //获取当月最后一日
        m = m < 10 ? "0" + m : m; //月份补 0
        d = d < 10 ? "0" + d : d; //日数补 0
        let endDate = [y, m, d].join("-");
        this.dates = [startDate, endDate]
        this.index2++
        this.componentData.entity.dates = `["${startDate}","${endDate}"]`
      },
            refreshTable() {
                this.$refs['ValueTable'].selectList()
            },
            refresh() {
                this.componentData.entity = this.HaveJson(this.entityCopy)
        this.componentData.init = true
        this.getDates()
                this.upIndex++
            },
      handleWeave(){
@@ -230,6 +248,13 @@
            },
      confirmClaim(){
        console.log(11111111111,this.$refs.Word.getValue())
      },
      datesChange(val){
        if(val == null){
          return
        }
        this.componentData.entity.dates = JSON.stringify(val)
        this.$refs['ValueTable'].selectList()
      }
        }
    }

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

@@ -92,23 +92,23 @@
                            v-model="componentData.entity.sampleType" @keyup.enter.native="refreshTable()"></el-input></div>
                </div>
        <div class="search_thing">
                    <div class="search_label">样品编号：</div>
                    <div class="search_input"><el-input size="small" placeholder="请输入" clearable
                            v-model="componentData.entity.sampleType" @keyup.enter.native="refreshTable()"></el-input></div>
                </div>
        <div class="search_thing">
                    <div class="search_label">样品型号：</div>
                    <div class="search_input"><el-input size="small" placeholder="请输入" clearable
                            v-model="componentData.entity.sampleType" @keyup.enter.native="refreshTable()"></el-input></div>
                    v-model="componentData.entity.sampleModel" @keyup.enter.native="refreshTable()"></el-input></div>
        </div>
        <div class="search_thing">
                    <div class="search_label">样品编号：</div>
                    <div class="search_input"><el-input size="small" placeholder="请输入" clearable
                            v-model="componentData.entity.sampleCode" @keyup.enter.native="refreshTable()"></el-input></div>
                </div>
        <div class="search_thing">
                    <div class="search_label">下单时间：</div>
                    <div class="search_input">
            <el-date-picker style="width:100%" v-model="componentData.entity.createTime"
            type="datetime"
            type="date"
            size="small"
            format="yyyy-MM-dd"
            value-format="yyyy-MM-dd"
            value-format="yyyy-MM-dd HH:mm:ss"
            clearable
            placeholder="选择日期">
            </el-date-picker>
@@ -242,6 +242,9 @@
                    entity: {
                        entrustCode: null,
                        sampleType: null,
            sampleName: null,
            sampleModel: null,
            sampleCode: null,
                        state: 0,
                        orderBy: {
                            field: 'id',

 src/components/view/b2-standard.vue

@@ -201,7 +201,6 @@
          <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="manHourGroup" 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>
      </el-row>