帷幄君成-富创-前端代码
上一版本: aee355e7 | 补丁 | 提交 | 显示空白
CD配唱片
2025-04-28 9090bb7dad196dfb3f60530491b21919c55c68e0 
合并最新dev解决冲突
已修改2个文件
160 ■■■■■ 文件已修改
src/views/mainPlan/gasPlanning/index.vue 152 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mainPlan/plateProcessStat/index.vue 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 src/views/mainPlan/gasPlanning/index.vue


@@ -7,7 +7,7 @@


      :inline="true"


      label-width="68px"


    >


      <el-row type="flex" justify="left" @click.stop="handleCancleStaus">


      <el-row type="flex" justify="left">


        <el-col :span="6">


          <el-form-item label="选择月份" prop="description">


            <el-date-picker


@@ -32,7 +32,7 @@


    </el-form>


    <div class="box_container">


      <el-row>


        <el-col :span="!clickedTableRef?22:20" @click="handleCancleStaus">


        <el-col :span="!clickedTableRef?22:20">


          <div class="title_text">管路规划产能</div>


        </el-col>


        <el-col :span="1" v-if="!clickedTableRef">


@@ -85,7 +85,6 @@


          :edit-config="{ trigger: 'click', mode: 'row', showStatus: true }"


          :data="routePlanList"


          size="small"


          @cell-click="cellClickEvent"


        >


          <vxe-column field="processName" title="标准工序名称" min-width="150" fixed="left">


          </vxe-column>


@@ -93,13 +92,8 @@


            field="dayProduceType"


            title="日产出类型"


            min-width="160"


            :edit-render="{}"


          >


            <template #edit="{ row }">


              <!-- <vxe-select


                v-model="row.dayProduceType"


                :options="dayProduceTypeOptions"


              ></vxe-select> -->


            <!-- <template #edit="{ row }">


              <el-select


                clearable


                v-model="row.dayProduceType"


@@ -113,7 +107,7 @@


                >


                </el-option>


              </el-select>


            </template>


            </template> -->


            <template #default="{ row }">


              <div v-if="!clickedTableRef">


                <span>{{ formatTypeLabel([row.dayProduceType]) }}</span>


@@ -123,6 +117,7 @@


                  clearable


                  v-model="row.dayProduceType"


                  style="width: 140px"


                  @change="handlechangeDayproduceType($event,row)"


                >


                  <el-option


                    v-for="type in dayProduceTypeOptions"


@@ -139,17 +134,16 @@


            field="dayProduceNum"


            title="日产出数量"


            min-width="200"


            :edit-render="{ autoFocus: 'input' }"


          >


            <template #edit="{ row }">


            <!-- <template #edit="{ row }">


              <el-input-number v-model="row.dayProduceNum" size="mini" />


            </template>


            </template> -->


            <template #default="{ row }">


              <div v-if="!clickedTableRef">


                <span>{{ row.dayProduceNum }}</span>


              </div>


              <div v-else>


                <el-input-number v-model="row.dayProduceNum" size="mini" />


                <el-input-number @change="cellClickEvent($event,row)" v-model="row.dayProduceNum" size="mini" />


              </div>


            </template>


          </vxe-column>


@@ -157,11 +151,10 @@


            field="dayProduceUnit"


            title="日产出单位"


            min-width="200"


            :edit-render="{ autoFocus: 'input' }"


          >


            <template #edit="{ row }">


            <!-- <template #edit="{ row }">


              <el-input v-model="row.dayProduceUnit" />


            </template>


            </template> -->


            <template #default="{ row }">


              <div v-if="!clickedTableRef">


                <span>{{ row.dayProduceUnit }}</span>


@@ -175,17 +168,16 @@


            field="personnelNumber"


            title="人员数量"


            min-width="200"


            :edit-render="{ autoFocus: 'input' }"


          >


            <template #edit="{ row }">


            <!-- <template #edit="{ row }">


              <el-input-number v-model="row.personnelNumber" />


            </template>


            </template> -->


            <template #default="{ row }">


              <div v-if="!clickedTableRef">


                <span>{{ row.personnelNumber }}</span>


              </div>


              <div v-else>


                <el-input-number v-model="row.personnelNumber" />


                <el-input-number @change="cellClickEvent($event,row)" v-model="row.personnelNumber" />


              </div>


            </template>


          </vxe-column>


@@ -193,11 +185,10 @@


            field="dayProduceAllNum"


            title="日产出总数量"


            min-width="200"


            :edit-render="{ autoFocus: 'input' }"


          >


            <template #edit="{ row }">


            <!-- <template #edit="{ row }">


              <el-input-number v-model="row.dayProduceAllNum" disabled />


            </template>


            </template> -->


            <template #default="{ row }">


              <div v-if="!clickedTableRef">


                <span>{{ row.dayProduceAllNum }}</span>


@@ -211,17 +202,16 @@


            field="days"


            title="天数"


            min-width="200"


            :edit-render="{ autoFocus: 'input' }"


          >


            <template #edit="{ row }">


            <!-- <template #edit="{ row }">


              <el-input-number v-model="row.days" />


            </template>


            </template> -->


            <template #default="{ row }">


              <div v-if="!clickedTableRef">


                <span>{{ row.days }}</span>


              </div>


              <div v-else>


                <el-input-number v-model="row.days" />


                <el-input-number @change="cellClickEvent($event,row)" v-model="row.days" />


              </div>


            </template>


          </vxe-column>


@@ -229,11 +219,10 @@


            field="monthProduceAllNum"


            title="月产出数量"


            min-width="200"


            :edit-render="{ autoFocus: 'input' }"


          >


            <template #edit="{ row }">


            <!-- <template #edit="{ row }">


              <el-input-number v-model="row.monthProduceAllNum" disabled />


            </template>


            </template> -->


            <template #default="{ row }">


              <div v-if="!clickedTableRef">


                <span>{{ row.monthProduceAllNum }}</span>


@@ -247,14 +236,14 @@


            field="remark"


            title="备注"


            min-width="200"


            :edit-render="{ autoFocus: 'input' }"


          >


            <template #edit="{ row }">


          <!-- :edit-render="{ autoFocus: 'input' }" -->


            <!-- <template #edit="{ row }">


              <el-input


                type="text"


                v-model="row.remark"


              />


            </template>


            </template> -->


            <template #default="{ row }">


              <div v-if="!clickedTableRef">


                <span>{{ row.remark }}</span>


@@ -287,7 +276,7 @@


    </div>


    <div class="box_container">


      <el-row>


        <el-col :span="!clickedTableRefGas?22:20" @click="handleCancleStausGas">


        <el-col :span="!clickedTableRefGas?22:20">


          <div class="title_text">气柜规划产能</div>


        </el-col>


        <el-col :span="1" v-if="!clickedTableRefGas">


@@ -331,7 +320,6 @@


          :height="height"


          :edit-config="{ mode: 'row', trigger: 'click', showStatus: true }"


          :data="gasPlanList"


          @cell-click="cellClickEventGas"


        >


          <vxe-column field="processName" title="标准工序名称" min-width="150" fixed="left">


          </vxe-column>


@@ -339,13 +327,8 @@


            field="dayProduceType"


            title="日产出类型"


            min-width="160"


            :edit-render="{}"


          >


            <template #edit="{ row }">


              <!-- <vxe-select


                v-model="row.dayProduceType"


                :options="dayProduceTypeOptions"


              ></vxe-select> -->


            <!-- <template #edit="{ row }">


              <el-select


                clearable


                v-model="row.dayProduceType"


@@ -359,7 +342,7 @@


                >


                </el-option>


              </el-select>


            </template>


            </template> -->


            <template #default="{ row }">


              <div v-if="!clickedTableRefGas">


                <span>{{ formatTypeLabel([row.dayProduceType]) }}</span>


@@ -369,6 +352,7 @@


                  clearable


                  v-model="row.dayProduceType"


                  style="width: 140px"


                  @change="handlechangeDayproduceType($event,row)"


                >


                  <el-option


                    v-for="type in dayProduceTypeOptions"


@@ -385,17 +369,16 @@


            field="dayProduceNum"


            title="日产出数量"


            min-width="200"


            :edit-render="{ autoFocus: 'input' }"


          >


            <template #edit="{ row }">


            <!-- <template #edit="{ row }">


              <el-input-number v-model="row.dayProduceNum" size="mini" />


            </template>


            </template> -->


            <template #default="{ row }">


              <div v-if="!clickedTableRefGas">


                <span>{{ row.dayProduceNum }}</span>


              </div>


              <div v-else>


                <el-input-number v-model="row.dayProduceNum" size="mini" />


                <el-input-number @change="cellClickEvent($event,row)" v-model="row.dayProduceNum" size="mini" />


              </div>


            </template>


          </vxe-column>


@@ -403,11 +386,10 @@


            field="dayProduceUnit"


            title="日产出单位"


            min-width="200"


            :edit-render="{ autoFocus: 'input' }"


          >


            <template #edit="{ row }">


            <!-- <template #edit="{ row }">


              <el-input v-model="row.dayProduceUnit" />


            </template>


            </template> -->


            <template #default="{ row }">


              <div v-if="!clickedTableRefGas">


                <span>{{ row.dayProduceUnit }}</span>


@@ -421,17 +403,16 @@


            field="personnelNumber"


            title="人员数量"


            min-width="200"


            :edit-render="{ autoFocus: 'input' }"


          >


            <template #edit="{ row }">


            <!-- <template #edit="{ row }">


              <el-input-number v-model="row.personnelNumber" />


            </template>


            </template> -->


            <template #default="{ row }">


              <div v-if="!clickedTableRefGas">


                <span>{{ row.personnelNumber }}</span>


              </div>


              <div v-else>


                <el-input-number v-model="row.personnelNumber" />


                <el-input-number @change="cellClickEvent($event,row)" v-model="row.personnelNumber" />


              </div>


            </template>


          </vxe-column>


@@ -439,11 +420,10 @@


            field="dayProduceAllNum"


            title="日产出总数量"


            min-width="200"


            :edit-render="{ autoFocus: 'input' }"


          >


            <template #edit="{ row }">


            <!-- <template #edit="{ row }">


              <el-input-number v-model="row.dayProduceAllNum" disabled />


            </template>


            </template> -->


            <template #default="{ row }">


              <div v-if="!clickedTableRefGas">


                <span>{{ row.dayProduceAllNum }}</span>


@@ -457,17 +437,16 @@


            field="days"


            title="天数"


            min-width="200"


            :edit-render="{ autoFocus: 'input' }"


          >


            <template #edit="{ row }">


            <!-- <template #edit="{ row }">


              <el-input-number v-model="row.days" />


            </template>


            </template> -->


            <template #default="{ row }">


              <div v-if="!clickedTableRefGas">


                <span>{{ row.days }}</span>


              </div>


              <div v-else>


                <el-input-number v-model="row.days" />


                <el-input-number @change="cellClickEvent($event,row)" v-model="row.days" />


              </div>


            </template>


          </vxe-column>


@@ -475,11 +454,10 @@


            field="monthProduceAllNum"


            title="月产出数量"


            min-width="200"


            :edit-render="{ autoFocus: 'input' }"


          >


            <template #edit="{ row }">


            <!-- <template #edit="{ row }">


              <el-input-number v-model="row.monthProduceAllNum" disabled />


            </template>


            </template> -->


            <template #default="{ row }">


              <div v-if="!clickedTableRefGas">


                <span>{{ row.monthProduceAllNum }}</span>


@@ -493,14 +471,13 @@


            field="remark"


            title="备注"


            min-width="200"


            :edit-render="{ autoFocus: 'input' }"


          >


            <template #edit="{ row }">


            <!-- <template #edit="{ row }">


              <el-input


                type="text"


                v-model="row.remark"


              />


            </template>


            </template> -->


            <template #default="{ row }">


              <div v-if="!clickedTableRefGas">


                <span>{{ row.remark }}</span>


@@ -567,7 +544,7 @@


        );


        return item ? item.label : type;


      })


      .join(",");


      .join("");


  }


  return "";


};


@@ -681,11 +658,16 @@


}


const handleCancleStaus = () => {


  clickedTableRef.value = false;


  handleQuery();


  const year = queryParams.value.date.split("-")[0];


  const month = parseInt(queryParams.value.date.split("-")[1]);


  getRouteList(year, month);




};


const handleCancleStausGas = () => {


  clickedTableRefGas.value = false;


  handleQuery();


  const year = queryParams.value.date.split("-")[0];


  const month = parseInt(queryParams.value.date.split("-")[1]);


  getGasList(year, month);


}


// const cancelRowEvent = () => {


//   const $table = tableRef.value;


@@ -744,7 +726,7 @@


    return {


      ...item,


      dayProduceType:


        item.dayProduceType == null ? "单人日产出" : item.dayProduceType,


        item.dayProduceType == null ? "1" : item.dayProduceType,


      dayProduceNum: item.dayProduceNum == null ? "0" : item.dayProduceNum,


      dayProduceUnit:


        item.dayProduceUnit == null ? "小时" : item.dayProduceUnit,


@@ -774,7 +756,7 @@


    return {


      ...item,


      dayProduceType:


        item.dayProduceType == null ? "单人日产出" : item.dayProduceType,


        item.dayProduceType == null ? "1" : item.dayProduceType,


      dayProduceNum: item.dayProduceNum == null ? "0" : item.dayProduceNum,


      dayProduceUnit:


        item.dayProduceUnit == null ? "小时" : item.dayProduceUnit,


@@ -793,12 +775,34 @@


  });


  loading2.value = false;


}


function cellClickEvent({ row, column }) {


// function cellClickEvent({ row, column }) {


//   console.log(row,column,"cellClickEvent")


//   if(row.dayProduceType==="1"){


//     row.dayProduceAllNum = row.dayProduceNum * row.personnelNumber;


//   }else{


    


//     row.dayProduceAllNum = row.dayProduceNum


//   }


//   row.monthProduceAllNum = row.dayProduceAllNum * row.days;


// }


function cellClickEvent(e, row) {


  console.log(row,"cellClickEvent")


  if(row.dayProduceType==="1"){


  row.dayProduceAllNum = row.dayProduceNum * row.personnelNumber;


  }else{


    


    row.dayProduceAllNum = row.dayProduceNum


  }


  row.monthProduceAllNum = row.dayProduceAllNum * row.days;


}


function cellClickEventGas({ row, column }) {


function handlechangeDayproduceType(e,row){


  row.dayProduceAllNum = "0";


  row.monthProduceAllNum = "0";


  if(e=="1"){


  row.dayProduceAllNum = row.dayProduceNum * row.personnelNumber;


  }else if(e=="2"){


    row.dayProduceAllNum = row.dayProduceNum


  }


  row.monthProduceAllNum = row.dayProduceAllNum * row.days;


}


function handleQuery() {




 src/views/mainPlan/plateProcessStat/index.vue


@@ -170,20 +170,20 @@


  {


    title: '计划开工日',


    field: 'processPlanStartDaytxt',


    width: 140,


    width: 200,


    type:'html'


  },


  {


    title: '计划完工日',


    field: 'processPlanEndDaytxt',


    width: 140,


    width: 200,


    type:'html'


  },


  {


    title: '订单完工日',


    field: 'orderPlanEndDay',


    width: 120,


    format: 'YYYY-MM-DD'


    width: 200,


    format: 'YYYY-MM-DD HH:mm:ss'


  }


]);