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

src/views/BasicSettings/colorSetting.vue

@@ -6,10 +6,10 @@
                 type='primary'
                 ghost
                 style="margin-right:10px;">返回</Button> -->
-        <Button type="primary"
+        <!-- <Button type="primary"
                 style="margin-right:10px;"
                 @click="handleColorChange(1)"
-                ghost>新增</Button>
+                ghost>新增</Button> -->
         <Button type="primary"
                 style="margin-right:10px;"
                 @click="handleSave"
@@ -22,6 +22,7 @@
              draggable
              :columns="columns"
              :data="tableData"
+             height="610"
              @on-drag-drop="onDragDrop">
         <template slot="colorStyle"
                   slot-scope="{row}">
@@ -151,10 +152,10 @@ export default {
       row.title ? this.addTitleName = row.title : ''
       this.showModal = true
     },
-    handleColorChange (state) {
-      this.addState = state
-      this.showModal = true
-    },
+    // handleColorChange (state) {
+    //   this.addState = state
+    //   this.showModal = true
+    // },
     handleColorConfirm () {
       if (this.addState == 1) {
         const tempdata = {

src/views/BidSystem/ProductDeOrder/deorderdetail.vue

@@ -351,16 +351,19 @@
             <template slot="timeSlot" slot-scope="{ index }">
               <Input
                 v-model="partsItem.partsProcessLineTableData[index].time"
+                :disabled="type == 2"
               />
             </template>
             <template slot="wagesSlot" slot-scope="{ index }">
               <Input
                 v-model="partsItem.partsProcessLineTableData[index].wages"
+                :disabled="type == 2"
               />
             </template>
             <template slot="capacitySlot" slot-scope="{ index }">
               <Input
                 v-model="partsItem.partsProcessLineTableData[index].capacity"
+                :disabled="type == 2"
               />
             </template>
           </Table>

src/views/Finance/productionCharts/index.vue

@@ -42,8 +42,7 @@ export default {
             pageSize:10,
             proxyObj:{},
             list:[
-                {title:'日期范围',start_server:'start_time',end_server:'end_time',start_value:'',end_value:'',isDate:true,start_placeholder:'开始日期',end_placeholder:'结束日期'},
-                {title:'部件价格',name:'Input',serverName:'price',value:'',placeholder:'请输入部件价格'}
+                {title:'日期范围',start_server:'start_time',end_server:'end_time',start_value:'',end_value:'',isDate:true,start_placeholder:'开始日期',end_placeholder:'结束日期'}
             ],
             tableColums:[
                 {title:'部件',align:'center',key:'parts_title'},
@@ -143,6 +142,9 @@ export default {
             this.pageIndex = 1
             row.page_size = this.pageSize;
             row.page_index = this.pageIndex;
+             row.start_time = row.start_time?new Date(row.start_time).getTime().toString().split('').splice(0,10).join(''):'';
+            row.end_time =row.end_time? new Date(row.end_time).getTime().toString().split('').splice(0,10).join(''):'';
+            console.log(row)
             this.getData(row)
         },
         getData(row){

src/views/ProcessRoute/index.vue

@@ -195,7 +195,7 @@ export default {
       tableData: [],
       pageIndex: 1,
       total: 0,
-      now_page: 1,
+      type:0,
       pageSize: 10,
       proxyObj: {
         page_index: 1,
@@ -216,7 +216,12 @@ export default {
   },
   beforeRouteLeave(to, from, next) {
     if (to.path == "/cms/processroute/edit") {
+      if(this.type !== 4 && this.type !==1){ 
       this.$route.meta.keepAlive = true;
+      }else{
+         this.$route.meta.keepAlive = false;
+      }
+     
     } else {
       this.$route.meta.keepAlive = false;
     }
@@ -239,17 +244,14 @@ export default {
       // 如果当前搜索条件为空，取上一次的搜索页码
       if (this.isEmptyQuery(row)) {
         row.page_index = this.defaultPageNumber;
-        this.now_page = this.defaultPageNumber;
         this.pageIndex = this.defaultPageNumber;
         row.page_size = this.pageSize;
       } else {
         this.pageIndex = row.page_index;
-        if (!row.page_index) {
-          row.page_index = this.now_page;
-        }
         row.page_size = this.pageSize;
       }
       this.proxyObj = row;
+      console.log(row)
       this.getData(row);
     },
     getData(row) {
@@ -328,7 +330,6 @@ export default {
     },
     changePage(e) {
       this.pageIndex = e;
-      this.now_page = e;
       this.proxyObj.page_index = this.pageIndex;
       const sortList = this.sortList.filter((item) => item.sort);
       this.proxyObj.sortList = sortList;
@@ -348,6 +349,7 @@ export default {
     },
     goPage(n, row) {
       let id = row ? row.id : "";
+      this.type = n;
       this.$router.push({
         path: "/cms/processroute/edit",
         query: {

src/views/ProductionOrderList/Dispatchlist/confirm.vue

@@ -129,7 +129,7 @@ export default {
           value: "",
           serverName: "basic_title",
           optionName: "title",
-          optionValue: "title",
+          optionValue: "id",
           option: this.produce_type_list,
         },
         {
@@ -139,7 +139,7 @@ export default {
           value: "",
           serverName: "procedure_title",
           optionName: "title",
-          optionValue: "title",
+          optionValue: "id",
           option: this.produces,
         },
         {

src/views/ProductionOrderList/Dispatchlist/details.vue

@@ -227,7 +227,7 @@ export default {
           value: "",
           serverName: "basic_title",
           optionName: "title",
-          optionValue: "title",
+          optionValue: "id",
           option: this.house_list,
         },
         {
@@ -237,7 +237,7 @@ export default {
           value: "",
           serverName: "procedure_title",
           optionName: "title",
-          optionValue: "title",
+          optionValue: "id",
           option: this.unit_list,
         },
         {

src/views/ProductionOrderList/workOver/confirm.vue

@@ -180,7 +180,7 @@ export default {
           value: "",
           serverName: "basic_title",
           optionName: "title",
-          optionValue: "title",
+          optionValue: "id",
           option: this.house_list,
         },
         {
@@ -190,7 +190,7 @@ export default {
           value: "",
           serverName: "procedure_title",
           optionName: "title",
-          optionValue: "title",
+          optionValue: "id",
           option: this.unit_list,
         },
         {