hw

src/views/Dispatching/Dispatching.vue

@@ -85,7 +85,7 @@
         <Table
           :columns="tableColumns"
           border
-          max-height="700"
+          max-height="454"
           @on-selection-change="handleSelectionChange"
           :data="tableData"
           ref="y_table"

src/views/OrderMannage/BusinessOrderlist/confirm.vue

@@ -338,7 +338,10 @@
             >
           </vxe-column>
        <!-- 产品里面的部件列表，线条门套门扇///////////////////////////////////////////////////////////////////////////////////////////// -->
-               <vxe-column v-for="part_type in part_type_total" :key="part_type.id + '999'" :title="part_type.title"
+             <vxe-column
+            v-for="part_type in part_type_total"
+            :key="part_type.id + '999'"
+            :title="part_type.title"
             min-width="90"
             :edit-render="{}"
           >
@@ -349,8 +352,8 @@
                   :key="part_index"
                   v-show="part_detail.type_id == part_type.id"
                   :style="
-                    part_index != scope.row.part.length - 1 &&
-                    scope.row.part.length > 1
+                    part_index != scope.row.part.filter(v=>{return v.type_id == part_type.id}).length - 1 &&
+                    scope.row.part.filter(v=>{return v.type_id == part_type.id}).length > 1
                       ? {
                           borderBottom: '1px solid #e8eaec',
                           padding: '10px 0',
@@ -365,7 +368,9 @@
                     filter-by-label
                     label-in-value
                     v-model="part_detail.change_id"
-                    @on-change="
+                   
+                  >
+                   <!-- @on-change="
                       (e) =>
                         changeEditPart(
                           scope.row,
@@ -374,8 +379,7 @@
                           e,
                           scope.rowIndex
                         )
-                    "
-                  >
+                    " -->
                     <Option
                       v-for="ch in part_detail.change"
                       :key="ch.id + '999'"
@@ -393,8 +397,8 @@
                   :key="part_index"
                   v-show="part_detail.type_id == part_type.id"
                   :style="
-                    part_index != scope.row.part.length - 1 &&
-                    scope.row.part.length > 1
+                    part_index != scope.row.part.filter(v=>{return v.type_id == part_type.id}).length - 1 &&
+                    scope.row.part.filter(v=>{return v.type_id == part_type.id}).length > 1
                       ? {
                           borderBottom: '1px solid #e8eaec',
                           padding: '10px 0',
@@ -822,12 +826,114 @@
       >
       </Table>
     </Modal>
+    <Modal v-model="showPartModal" :width="1400" :mask-closable="false" title="编辑产品">
+         <Tabs>
+        <TabPane label="macOS" icon="logo-apple">
+             <Card style="width:100%">
+               <h2>产品信息</h2>
+             <Form class="modal_form" :label-width='100'>
+               <FormItem label='选择产品：'>
+                 <Select filterable clearable transfer class="modal_form_item" size="small">
+                   <Option/>
+                 </Select>
+               </FormItem>
+              <FormItem label='位置：'>
+                <Input clearable placeholder="请输入位置" class="modal_form_item" size="small"/>
+              </FormItem>
+              <FormItem label='计量单位：'>
+                <Input clearable placeholder="自动带出" disabled class="modal_form_item" size="small"/>
+              </FormItem>
+              <FormItem :label='`${process.name}:`'
+              v-for="process in bpp_list"
+            :key="process.id + 'bpp'">
+            <Select filterable clearable transfer class="modal_form_item" size="small">
+                   <Option/>
+                 </Select>
+            </FormItem> 
+              <FormItem label='数量：'>
+            <Input clearable placeholder="请输入产品数量" class="modal_form_item" size="small"/>
+              </FormItem>
+              <FormItem label='核算数量：'>
+                <Input clearable placeholder="自动带出" disabled class="modal_form_item" size="small"/>
+              </FormItem>
+              <FormItem label='单价：'>
+                <Input clearable placeholder="自动带出" class="modal_form_item" size="small"/>
+              </FormItem>
+              <FormItem label='附加金额:'>
+                <Input clearable placeholder="自动带出" class="modal_form_item" size="small"/>
+              </FormItem>
+              <FormItem label='超标金额:'>
+                <Input clearable placeholder="自动带出" class="modal_form_item" size="small"/>
+              </FormItem>
+              <FormItem label='金额:'>
+                <Input clearable placeholder="自动带出" class="modal_form_item" size="small"/>
+              </FormItem>
+              <FormItem label='图号:'>
+                <Input clearable placeholder="自动带出" class="modal_form_item" size="small"/>
+              </FormItem>
+              <FormItem label='备注:'>
+                <Select filterable clearable transfer class="modal_form_item" size="small">
+                   <Option/>
+                 </Select>
+              </FormItem>
+              <FormItem label='产品图:'></FormItem>
+             </Form>
+    </Card>
+     <Card style="width:100%">
+       <h2>部件信息</h2>
+       <div>
+         
+        <Form :label-width='100' class="modal_part_form">
+          <FormItem label-width='20'>
+            <Radio></Radio>
+          </FormItem>
+          <FormItem label='部件'></FormItem>
+          <FormItem label='动态字段'></FormItem>
+          <FormItem label='动态字段'></FormItem>
+        </Form>
+       </div>
+       
+     </Card>
+     <Card style="width:100%">
+       <div class="modal_info_title">
+          <h2 style="margin-right:20px">附加信息</h2>
+        <Button type="primary" size='small'>新增附加项目</Button>
+       </div>
+       <Row class="modal_info">
+         <Col span="4">
+         <label>附加项目：</label>
+         <Select filterable clearable transfer size="small" class="modal_info_item">
+           <Option/>
+         </Select>
+         </Col>
+         <Col span="4">
+         <label>数量：</label>
+         <Input clearable placeholder="请输入" size="small" class="modal_info_item"/>
+         </Col>
+         <Col span="4">
+         <label>单价：</label>
+         <Input clearable placeholder="请输入" size="small" class="modal_info_item"/></Col>
+         <Col span="4">
+         <label>金额：</label>
+         <Input clearable placeholder="请输入" size="small" class="modal_info_item"/></Col>
+         <Col span="4">
+         <label>备注：</label>
+         <Input clearable placeholder="请输入" size="small" class="modal_info_item"/></Col>
+         <Col span="3">
+         <a style="color:red">删除</a>
+         </Col>
+       </Row>
+     </Card>
+        </TabPane>
+    </Tabs>
+    </Modal>
     </div>
 </template>
 <script>
   export default {
     data() {
       return {
+        showPartModal:false,
         extList:[],
         processOption:{value:'id',label:'title'},
         productList:[],//modal里面产品的下拉
@@ -1429,9 +1535,9 @@ handleExtraDele(arr,index){
       handleMTBClick(){
 
       },
-      changeEditPart(){
+      // changeEditPart(){
 
-      },
+      // },
        changeEditMeasure(){
 
        },
@@ -1454,7 +1560,32 @@ handleExtraDele(arr,index){
 
       },
     handleSet(row, rowIndex,type){
-             
+      //type 2 编辑 3删除 4复制 5 详情
+             if(!row.select_all_id&&type!=3){ //如果没有选择产品名称/五金并且不是删除按钮
+                   return this.$Message.warning('请先选择产品名称/五金！')
+             }
+        switch(type){
+          case 2://编辑
+          this.partData = this.tableData[rowIndex].part;
+          this.showPartModal = true;
+            break;
+          case 3: //删除
+          if(this.tableData.length==1){
+            return
+          }
+          this.confirmDelete({
+            title:"确认",
+            content:'确认删除么？',
+            then:()=>{
+              this.tableData.splice(rowIndex,1);
+            }
+          })
+            break;
+          case 4://复制
+            break;
+          case 5://详情
+            break;
+        }
     },
       rowClick(row,index){  
         console.log(1)
@@ -1592,4 +1723,30 @@ handleExtraDele(arr,index){
   text-overflow: ellipsis;
   white-space: nowrap;
 }
+.modal_form{
+  display: flex;
+  flex-wrap: wrap;
+  margin-top: 15px;
+  .modal_form_item{
+    width:150px;
+  }
+}
+.modal_part_form{
+  display: flex;
+justify-content: flex-start;
+}
+.modal_info_title{
+  display: flex;
+  align-items: center;
+}
+/deep/.ivu-col{
+  display: flex;
+}
+.modal_info{
+  margin:15px 0 0 0;
+  .modal_info_item{
+  width:120px
+}
+}
+
 </style>

src/views/OrderMannage/BusinessOrderlist/edit.vue

@@ -709,8 +709,8 @@
                   :key="part_index"
                   v-show="part_detail.type_id == part_type.id"
                   :style="
-                    part_index != scope.row.part.length - 1 &&
-                    scope.row.part.length > 1
+                    part_index != scope.row.part.filter(v=>{return v.type_id == part_type.id}).length - 1 &&
+                    scope.row.part.filter(v=>{return v.type_id == part_type.id}).length > 1
                       ? {
                           borderBottom: '1px solid #e8eaec',
                           padding: '10px 0',
@@ -753,8 +753,8 @@
                   :key="part_index"
                   v-show="part_detail.type_id == part_type.id"
                   :style="
-                    part_index != scope.row.part.length - 1 &&
-                    scope.row.part.length > 1
+                    part_index != scope.row.part.filter(v=>{return v.type_id == part_type.id}).length - 1 &&
+                    scope.row.part.filter(v=>{return v.type_id == part_type.id}).length > 1
                       ? {
                           borderBottom: '1px solid #e8eaec',
                           padding: '10px 0',

src/views/leadMatch/MatchList/HXYMatchCheck.vue

@@ -384,6 +384,7 @@ export default {
           { title: "户型", align: "center", minWidth: 100,key:'household'},
           { title: "房号", align: "center", minWidth: 100,key:'house_number'},
            { title: "生产数量", align: "center", minWidth: 100,key:'product_num'},
+           { title: "行号", align: "center", minWidth: 100,key:'line'},
           { title: "组合名称", align: "center", key: "compose_name", minWidth: 100 },
         { title: "部件名称", align: "center", key: "part_name", minWidth: 100 },
         {

src/views/leadMatch/MatchList/HXYMatchPage.vue

@@ -971,7 +971,7 @@ export default {
         { title: "序号", align: "center", type: "index", minWidth: 60 },
           { title: "组合名称", align: "center", key: "compose_name", minWidth: 100 },
         { title: "部件名称", align: "center", key: "part_name", minWidth: 100 },
-        { title: "行号", align: "center", key: "line_number", minWidth: 100 },
+        { title: "行号", align: "center", key: "line", minWidth: 100 },
         {
           title: "产品材料",
           align: "center",

src/views/leadMatch/MatchList/NewHXYMatchPage.vue

@@ -824,7 +824,7 @@ export default {
         { title: "序号", align: "center", type: "index", minWidth: 60 },
           { title: "组合名称", align: "center", key: "compose_name", minWidth: 100 },
         { title: "部件名称", align: "center", key: "part_name", minWidth: 100 },
-        { title: "行号", align: "center", key: "line_number", minWidth: 100 },
+        { title: "行号", align: "center", key: "line", minWidth: 100 },
         {
           title: "产品材料",
           align: "center",
@@ -887,6 +887,7 @@ export default {
           { title: "户型", align: "center", minWidth: 100,key:'household'},
           { title: "房号", align: "center", minWidth: 100,key:'house_number'},
            { title: "生产数量", align: "center", minWidth: 100,key:'product_num'},
+           { title: "行号", align: "center", minWidth: 100,key:'line'},
           { title: "组合名称", align: "center", key: "compose_name", minWidth: 100 },
         { title: "部件名称", align: "center", key: "part_name", minWidth: 100 },
         {

src/views/leadMatch/roomList/HXYedit.vue

@@ -211,6 +211,18 @@ export default {
                         width: 200 },
  { title: "自定义项1", key: "ext_1", align: "center", minWidth: 140 },
   { title: "自定义项2", key: "ext_2", align: "center", minWidth: 140 },
+  { title: "自定义项3", key: "ext_3", align: "center", minWidth: 140 },
+  { title: "自定义项4", key: "ext_4", align: "center", minWidth: 140 },
+  { title: "自定义项5", key: "ext_5", align: "center", minWidth: 140 },
+  { title: "自定义项6", key: "ext_6", align: "center", minWidth: 140 },
+  { title: "自定义项7", key: "ext_7", align: "center", minWidth: 140 },
+  {title:'匹配项1',key:'匹配项1',align: "center", minWidth: 140},
+  {title:'匹配项2',key:'匹配项2',align: "center", minWidth: 140},
+  {title:'匹配项3',key:'匹配项3',align: "center", minWidth: 140},
+  {title:'匹配项4',key:'匹配项4',align: "center", minWidth: 140},
+  {title:'匹配项5',key:'匹配项5',align: "center", minWidth: 140},
+  {title:'匹配项6',key:'匹配项6',align: "center", minWidth: 140},
+  {title:'匹配项7',key:'匹配项7',align: "center", minWidth: 140},
                { title: "匹配状态", key: "match_state", align: "center", minWidth: 140 ,slot:'match_state'}
       ],
       showType: false,

src/views/leadMatch/weightMemo/HXYedit.vue

@@ -168,6 +168,7 @@ export default {
       tableColumns:[
             { title: "序号", type:'index', align: "center",resizable: true,
                         width: 100 },
+                        {title:'行号',align:'center',resizable:true,width:100,key:'line_number'},
                 { title: "组合名称", key:'compose_name', align: "center",resizable: true,
                         width: 100,render:(h,params)=>{
                             const {row} = params;

vue.config.js

@@ -1,8 +1,8 @@
 const axios_default_ip =
   process.env.NODE_ENV == "dev"
-    ? "http://121.41.102.225:82"
+    ? "http://124.71.176.88:882"
     : process.env.NODE_ENV == "test-prd"
-    ? "http://hxy_api.qingyaokeji.com" //测试服
+    ? "http://121.41.102.225:82" //测试服
     : process.env.NODE_ENV == "prd_other"
     ? "http://121.37.173.82:82" //贝斯特
     : "http://124.71.176.88:882";