Merge branch 'hw' of http://121.41.102.225:8099/Nidong/jiufang

src/components/currencyPage/index.vue

@@ -58,6 +58,12 @@
                 :row="row"
                 :index='index'></slot>
         </template>
+         <template slot-scope="{ row,index }"
+                  slot="fashion">
+          <slot name="fashion"
+                :row="row"
+                :index='index'></slot>
+        </template>
       </Table>
 
       <slot></slot>

src/views/BidSystem/DeepeningOrder/change.vue

@@ -166,15 +166,7 @@
               </span>
             </FormItem>
             <FormItem label="订单类型:">
-          <Select v-model="formData.type"
-                  :disabled="isChecked"
-                  size="small"
-                  style="width:200px">
-            <Option label='工装'
-                    :value=1></Option>
-            <Option label='家装'
-                    :value=2></Option>
-          </Select>
+            <span>工装</span>
         </FormItem>
             <FormItem
               v-for="item in formData.special"
@@ -326,10 +318,10 @@ export default {
           minWidth: 100,
         },
         { title: "户型", key: "house_type", align: "center", minWidth: 100 },
-        { title: "备注", key: "remark", align: "center", minWidth: 100 },
+        { title: "区域备注", key: "area_remark", align: "center", minWidth: 100 },
         { title: "产品名称", key: "title", align: "center", minWidth: 100 },
         { title: "数量", key: "num", align: "center", minWidth: 100 },
-        { title: "规格", key: "measure", align: "center", minWidth: 100 },
+        { title: "规格", key: "measure", align: "center", minWidth: 170 },
         {
           title: "工艺属性",
           key: "process_property",
@@ -388,7 +380,7 @@ export default {
           },
         },
         { title: "图号", key: "url_number", align: "center", minWidth: 100 },
-        { title: "备注", key: "remark", align: "center", minWidth: 100 },
+        { title: "产品备注", key: "remark", align: "center", minWidth: 100 },
         {
           title: "操作",
           key: "remark",

src/views/BidSystem/DeepeningOrder/changeDetail.vue

@@ -1,5 +1,11 @@
 <template>
   <div class="changeDetail">
+    <Modal class-name="vertical-center-modal" title='保存' v-model='show' :width="400" @on-ok="then"
+        @on-cancel="show = false">
+            <div>
+                <span>确认保存吗？</span>
+            </div>
+        </Modal>
     <Toptitle title="变更">
       <slot name="titleButton">
          <Button
@@ -386,7 +392,7 @@
           <span v-else>{{ tableData[index].model }}</span>
         </template>
          <template slot="status" slot-scope="{ row }">
-          <span>{{ row.status === 5 ||row.status === 0||row.status === 2?'':row.status === 4?'变更':'新增' }}</span>
+          <span>{{ row.status === 5 ||row.status === 2?'':row.status === 4||row.check_state?'变更':'新增' }}</span>
         </template>
         <template slot="long" slot-scope="{ row, index }">
           <Input
@@ -487,9 +493,11 @@ export default {
       },
       cascader_list: [],
       building_list: [],
+      show:false,
       type: 1,
       unit_list: [],
       floor_list: [],
+      affirm:false,
       room_number_list: [],
       product_title_list: [],
       pic_number_list: [],
@@ -697,15 +705,8 @@ export default {
     );
   },
   methods: {
-      handleFinish(){
-         if(this.formData.depart_end ==null||
-       this.formData.depart_start == null||
-       this.formData.change_type == null||
-       this.formData.msg == null||
-       this.formData.contact_order_no == null){
-             this.$Message.error('请填写完整信息');
-         }else{
-          let arr = [];
+    then(){
+ let arr = [];
           let arr1 = [];
           this.tableData.forEach(item=>{
               item.product_title = item.title
@@ -737,6 +738,20 @@ export default {
                   this.goback()
               }
           })
+    },
+      handleFinish(){
+         if(this.formData.depart_end ==null||
+       this.formData.depart_start == null||
+       this.formData.change_type == null||
+       this.formData.msg == null||
+       this.formData.contact_order_no == null){
+             this.$Message.error('请填写完整信息');
+         }else{
+           if(this.affirm){
+             this.$Message.warning('变更请确认！');
+           }else{
+            this.show = true;
+         }
          }
       },
     add_line() {
@@ -810,7 +825,12 @@ export default {
     handleSet(row, index, type) {
       switch (type) {
         case 1:
-          
+          this.affirm = false;
+          this.tableData.forEach(item=>{
+            if(item.status === 1){
+              item.input_state = true
+            }
+          })
           if (!row.check_state) {
             this.copy_data[row.table_id-1].state = '变更';
             this.ListData.push(this.copy_data[row.table_id-1]);
@@ -830,6 +850,9 @@ export default {
           }
           break;
         case 2:
+            if(this.affirm){
+             this.$Message.warning('更改请确认！')
+           }else{
           this.tableData.splice(index, 0, row);
            this.tableData[index + 1].check_state = false;
           this.tableData[index+1].status = 1;
@@ -838,9 +861,12 @@ export default {
           this.tableData[index+1].table_id = null;
           //标记是复制的数据
           this.tableData[index + 1].copy_state = true;
-          console.log(row);
+          console.log(row);}
           break;
         case 3:
+            if(this.affirm){
+             this.$Message.warning('更改请确认！')
+           }else{
             this.confirmDelete({
         content: "确认删除么？",
         then: () => {
@@ -899,12 +925,23 @@ export default {
           }
         }
             });
+           }
          break;
          case 4:
+           if(this.affirm){
+             this.$Message.warning('更改请确认！')
+           }else{
             this.tableData[index].input_state = true;
             row.input_state = true;
             this.tableData[index].status = 4;
             row.status = 4;
+            this.affirm = true;
+            this.tableData.forEach(item=>{
+              if(item.status===1){
+                item.input_state = false
+              }
+            })
+            }
            break;
       }
     },

src/views/BidSystem/DeepeningOrder/changeRecord.vue

@@ -32,6 +32,10 @@
               />
             </div>
           </template>
+           <template slot="fashion" slot-scope="{ row }">
+               <div> <span>{{row.fashion === 0?'无':row.fashion ===1?'左':'右'}}</span></div>
+           
+          </template>
         </FullPage>
     </div>
 </template>
@@ -59,7 +63,7 @@ export default {
                 {title:'规格',align:'center',width:'200',key:'measure'},
                 {title:'工艺属性',align:'center',width:'200',key:'process_property'},
                 {title:'图纸',align:'center',width:'200',key:'img', slot: "urlSet"},
-                {title:'左右式',align:'center',width:'200',key:'fashion'},
+                {title:'左右式',align:'center',width:'200',key:'fashion',slot:'fashion'},
                 {title:'图号',align:'center',width:'200',key:'url_number'},
                 {title:'产品备注',align:'center',width:'200',key:'product_remark'},
                 {title:'变更时间',align:'center',width:'200',key:'crt_time'},
@@ -158,7 +162,7 @@ export default {
                     this.log_List.start_time = this.func.replaceDateNoHMS(this.log_List.start_time)
                     this.log_List.end_time = this.func.replaceDateNoHMS(this.log_List.end_time)
                     this.tableData.forEach(item=>{
-                        item.crt_time = this.func.replaceDateNoHMS(item.crt_time)
+                        item.crt_time = this.func.replaceDate(item.crt_time)
                     })
                 }
             })