2024-09-06

src/optionSystem/FProductManage/modules/diefa/diefaAdd.vue

@@ -222,6 +222,7 @@
                             <MyTable fixedName="operation" :height="tableHeight" :noQuery="true" ref="excelRef" :tableName="guangtouParam.content.where.drivetype=='电动'?'excelTable1':'excelTable2'" :layout="guangtouParam.content.where.drivetype=='电动'?tool.tabelCol($route.name)['excelTable1'].tablecols:tool.tabelCol($route.name)['excelTable2'].tablecols" :param="excelParam" :opwidth="200" :custom="true" style="margin-top: 14px">
                                 <template v-slot:customcol="scope">
                                     <div v-if="scope.column.columnname == 'matchratio'" style="color:red">{{scope.column.data[scope.column.columnname]}}</div>
+                                    <span v-else-if="scope.column.columnname == 'maxsquarewidth'">{{scope.column.data[scope.column.columnname].join(',')}}</span>
                                     <span v-else-if="scope.column.columnname != 'operation'">{{scope.column.data[scope.column.columnname]}}</span>
                                 </template>
                                 <template v-slot:opreation="scope">
@@ -379,6 +380,7 @@ export default {
             bodystructure:[],
             func:[],
             guangtouList:[],
+
             form: {
                 "itemid": 0,
                 "plm_itemextendid": 0,
@@ -632,7 +634,7 @@ export default {
             switch (val) {
                 case '电动':
                     this.excelParam = {
-                        "id": 20240718162202,
+                        "id": 20240710163402,
                         "content": {
                             "itemid": 0,//光头id
                             "pageNumber": 1,

src/optionSystem/FProductManage/modules/diefa/edit.vue

@@ -222,6 +222,7 @@
                             <MyTable fixedName="operation" :height="tableHeight" :noQuery="true" ref="excelRef" :tableName="guangtouParam.content.where.drivetype=='电动'?'excelTable1':'excelTable2'" :layout="guangtouParam.content.where.drivetype=='电动'?tool.tabelCol($route.name)['excelTable1'].tablecols:tool.tabelCol($route.name)['excelTable2'].tablecols" :param="excelParam" :opwidth="200" :custom="true" style="margin-top: 14px">
                                 <template v-slot:customcol="scope">
                                     <div v-if="scope.column.columnname == 'matchratio'" style="color:red">{{scope.column.data[scope.column.columnname]}}</div>
+                                    <span v-else-if="scope.column.columnname == 'maxsquarewidth'">{{scope.column.data[scope.column.columnname].join(',')}}</span>
                                     <span v-else-if="scope.column.columnname != 'operation'">{{scope.column.data[scope.column.columnname]}}</span>
                                 </template>
                                 <template v-slot:opreation="scope">
@@ -635,7 +636,7 @@
             switch (val) {
                 case '电动':
                     this.excelParam = {
-                        "id": 20240718162202,
+                        "id": 20240710163402,
                         "content": {
                             "itemid": 0,//光头id
                             "pageNumber": 1,

src/optionSystem/optionOrder/detail/modules/components/DieFa.vue

@@ -254,6 +254,7 @@
             <MyTable fixedName="operation" :height="tableHeight" :noQuery="true" ref="excelRef" :tableName="guangtouParam.content.where.drivetype=='电动'?'excelTable1':'excelTable2'" :layout="guangtouParam.content.where.drivetype=='电动'?tool.tabelCol($route.name)['excelTable1'].tablecols:tool.tabelCol($route.name)['excelTable2'].tablecols" :param="excelParam" :opwidth="200" :custom="true" style="margin-top: 14px">
                 <template v-slot:customcol="scope">
                     <p v-if="scope.column.columnname == 'matchratio'" style="color:red">{{scope.column.data[scope.column.columnname]}}</p>
+                    <span v-else-if="scope.column.columnname == 'maxsquarewidth'">{{scope.column.data[scope.column.columnname].join(',')}}</span>
                     <span v-else-if="scope.column.columnname != 'operation'">{{scope.column.data[scope.column.columnname]}}</span>
                 </template>
                 <template v-slot:opreation="scope">

src/optionSystem/selectOption/components/DieFa.vue

@@ -132,6 +132,7 @@
             <MyTable fixedName="operation" :height="tableHeight" :noQuery="true" ref="excelRef" :tableName="guangtouParam.content.where.drivetype=='电动'?'excelTable1':'excelTable2'" :layout="guangtouParam.content.where.drivetype=='电动'?tool.tabelCol($route.name)['excelTable1'].tablecols:tool.tabelCol($route.name)['excelTable2'].tablecols" :param="excelParam" :opwidth="200" :custom="true" style="margin-top: 14px">
                 <template v-slot:customcol="scope">
                     <span v-if="scope.column.columnname == 'matchratio'" style="color:red">{{scope.column.data[scope.column.columnname]}}</span>
+                    <span v-else-if="scope.column.columnname == 'maxsquarewidth'">{{scope.column.data[scope.column.columnname].join(',')}}</span>
                     <span v-else-if="scope.column.columnname != 'operation'">{{scope.column.data[scope.column.columnname]}}</span>
                 </template>
                 <template v-slot:opreation="scope">

src/optionSystem/valveOption/DieFa.vue

@@ -137,6 +137,31 @@
         </div>
         <!--选执行器-->
         <div class="dialog-content" v-show="active == 2">
+            <div class="option-line">
+                <div class="item">
+                    <div class="label">执行器:</div>
+                    <el-input
+                        placeholder="型号/料号"
+                        v-model="excelParam.content.where.condition1"
+                        clearable
+                        @clear="Search('excelParam')"
+                        size="small"
+                        @keyup.enter.native="Search('excelParam')">
+                    </el-input>
+                </div>
+
+                <div class="item" v-if="guangtouParam.content.where.drivetype!='气动'">
+                    <div class="label">减速箱:</div>
+                    <el-input
+                        placeholder="型号/料号"
+                        v-model="excelParam.content.where.condition2"
+                        clearable
+                        @clear="Search('excelParam')"
+                        size="small"
+                        @keyup.enter.native="Search('excelParam')">
+                    </el-input>
+                </div>
+            </div>
             <div class="option-line" v-if="guangtouParam.content.where.drivetype=='气动'">
                 <div class="item">
                     <div class="label">驱动方式:</div>
@@ -206,6 +231,7 @@
             <MyTable fixedName="operation" :height="tableHeight" :noQuery="true" ref="excelRef" :tableName="guangtouParam.content.where.drivetype=='电动'?'excelTable1':'excelTable2'" :layout="guangtouParam.content.where.drivetype=='电动'?tool.tabelCol($route.name)['excelTable1'].tablecols:tool.tabelCol($route.name)['excelTable2'].tablecols" :param="excelParam" :opwidth="200" :custom="true" style="margin-top: 14px">
                 <template v-slot:customcol="scope">
                     <span v-if="scope.column.columnname == 'matchratio'" style="color:red">{{scope.column.data[scope.column.columnname]}}</span>
+                    <span v-else-if="scope.column.columnname == 'maxsquarewidth'">{{scope.column.data[scope.column.columnname].join(',')}}</span>
                     <span v-else-if="scope.column.columnname != 'operation'">{{scope.column.data[scope.column.columnname]}}</span>
                 </template>
                 <template v-slot:opreation="scope">