no message

src/untils/until.js

@@ -1,155 +1,156 @@
 export default {
-  isType(obj) {
-    //类型判断
-    var regexp = /\s(\w+)\]/;
-    var result = regexp.exec(Object.prototype.toString.call(obj))[1];
-    return result;
-  },
-  dateFormat(time) {
-    const t = new Date(time * 1000);
-    // 日期格式
-    const format = 'Y-m-d h:i:s';
-    const year = t.getFullYear();
-    // 由于 getMonth 返回值会比正常月份小 1
-    const month = t.getMonth() + 1;
-    const day = t.getDate();
-    const hours = t.getHours();
-    const minutes = t.getMinutes();
-    const seconds = t.getSeconds();
-    const hash = {
-      Y: year,
-      m: month,
-      d: day,
-      h: hours,
-      i: minutes,
-      s: seconds,
-    };
-    return format.replace(/\w/g, (o) => {
-      return hash[o];
-    });
-  },
-  replaceDate(str, flag) {
-    //时间戳转换
-    if (str) {
-      str = str.toString().length == 10 ? str * 1000 : str;
-      let now = str ? new Date(str) : new Date(),
-        y = now.getFullYear(),
-        m = now.getMonth() + 1,
-        d = now.getDate();
-      if (flag) {
-        return y + '-' + (m < 10 ? '0' + m : m) + '-' + (d < 10 ? '0' + d : d);
-      }
-      return (
-        y +
-        '-' +
-        (m < 10 ? '0' + m : m) +
-        '-' +
-        (d < 10 ? '0' + d : d) +
-        ' ' +
-        now.toTimeString().substr(0, 8)
-      );
-    } else {
-      return null;
-    }
-  },
-  replaceDateNoHMS(str) {
-    //时间戳转换
-    if (str) {
-      str = str.toString().length == 10 ? str * 1000 : str;
-      let now = str ? new Date(str) : new Date(),
-        y = now.getFullYear(),
-        m = now.getMonth() + 1,
-        d = now.getDate();
-      return y + '-' + (m < 10 ? '0' + m : m) + '-' + (d < 10 ? '0' + d : d);
-    } else {
-      return null;
-    }
-  },
-  //时间转换
-  setDate(time) {
-    let data = '';
-    if (Object.prototype.toString.call(time) === '[object Date]') {
-      data = new Date(time).toLocaleDateString().replace(/\//g, '-');
-    }
-    return data;
-  },
-  uniquesObjs(obj) {
-    //去除统一数组中相同的对象
-    let uniques = [];
-    let stringify = {};
-    for (let i = 0; i < obj.length; i++) {
-      let keys = Object.keys(obj[i]);
-      keys.sort(function(a, b) {
-        return Number(a) - Number(b);
-      });
-      let str = '';
-      for (let j = 0; j < keys.length; j++) {
-        str += JSON.stringify(keys[j]);
-        str += JSON.stringify(obj[i][keys[j]]);
-      }
-      if (!stringify.hasOwnProperty(str)) {
-        uniques.push(obj[i]);
-        stringify[str] = true;
-      }
-    }
-    uniques = uniques;
-    return uniques;
-  },
-  throttle(func, wait) {
-    //节流
-    let timer = null;
-    let fn = function() {
-      if (!timer) {
-        let args = Array.from(arguments);
-        timer = setTimeout(() => {
-          func.apply(this, args);
-          timer = null;
-        }, wait);
-      }
-    };
-    return fn;
-  },
-  shake(func, t) {
-    //防抖
-    let fn = function() {
-      let args = Array.from(arguments);
-      clearTimeout(func.id);
-      func.id = setTimeout(() => {
-        func.apply(this, args);
-      }, t);
-    };
-    return fn;
-  },
-  objToParams(obj) {
-    let result = '';
-    for (let i in obj) {
-      result += `&${i}=${obj[i]}`;
-    }
-    result = '?' + result.substr(1, result.length - 1);
-    return result;
-  },
-  computedForm(array, header) {
-    const result = array.reduce((pre, cur) => {
-      const data = header.filter(
-        (row) => cur.is_show && row.serverName == cur.key
-      );
-      if (data && data.length == 1) {
-        return pre.concat(data);
-      } else {
-        return pre;
-      }
-    }, []);
-    return result;
-  },
-  computedHeader(array, header) {
-    const result = array.reduce((pre, cur) => {
-      const data = header.filter((row) => cur.is_show && row.key == cur.key);
-      if (data && data.length == 1) {
-        return pre.concat(data);
-      } else {
-        return pre;
-      }
-    }, []);
-    return result;
-  },
-};
+    isType(obj) {
+        //类型判断
+        var regexp = /\s(\w+)\]/;
+        var result = regexp.exec(Object.prototype.toString.call(obj))[1];
+        return result;
+    },
+    dateFormat(time) {
+        const t = new Date(time * 1000);
+        // 日期格式
+        const format = 'Y-m-d h:i:s';
+        const year = t.getFullYear();
+        // 由于 getMonth 返回值会比正常月份小 1
+        const month = t.getMonth() + 1;
+        const day = t.getDate();
+        const hours = t.getHours();
+        const minutes = t.getMinutes();
+        const seconds = t.getSeconds();
+        const hash = {
+            Y: year,
+            m: month,
+            d: day,
+            h: hours,
+            i: minutes,
+            s: seconds,
+        };
+        return format.replace(/\w/g, (o) => {
+            return hash[o];
+        });
+    },
+    replaceDate(str, flag) {
+        //时间戳转换
+        if (str) {
+            str = str.toString().length == 10 ? str * 1000 : str;
+            let now = str ? new Date(str) : new Date(),
+                y = now.getFullYear(),
+                m = now.getMonth() + 1,
+                d = now.getDate();
+            if (flag) {
+                return y + '-' + (m < 10 ? '0' + m : m) + '-' + (d < 10 ? '0' + d : d);
+            }
+            return (
+                y +
+                '-' +
+                (m < 10 ? '0' + m : m) +
+                '-' +
+                (d < 10 ? '0' + d : d) +
+                ' ' +
+                now.toTimeString().substr(0, 8)
+            );
+        } else {
+            return null;
+        }
+    },
+    replaceDateNoHMS(str) {
+        //时间戳转换
+        if (str) {
+            str = str.toString().length == 10 ? str * 1000 : str;
+            let now = str ? new Date(str) : new Date(),
+                y = now.getFullYear(),
+                m = now.getMonth() + 1,
+                d = now.getDate();
+            return y + '-' + (m < 10 ? '0' + m : m) + '-' + (d < 10 ? '0' + d : d);
+        } else {
+            return null;
+        }
+    },
+    //时间转换
+    setDate(time) {
+        let data = '';
+        if (Object.prototype.toString.call(time) === '[object Date]') {
+            data = new Date(time).toLocaleDateString().replace(/\//g, '-');
+        }
+        return data;
+    },
+    uniquesObjs(obj) {
+        //去除统一数组中相同的对象
+        let uniques = [];
+        let stringify = {};
+        for (let i = 0; i < obj.length; i++) {
+            let keys = Object.keys(obj[i]);
+            keys.sort(function(a, b) {
+                return Number(a) - Number(b);
+            });
+            let str = '';
+            for (let j = 0; j < keys.length; j++) {
+                str += JSON.stringify(keys[j]);
+                str += JSON.stringify(obj[i][keys[j]]);
+            }
+            if (!stringify.hasOwnProperty(str)) {
+                uniques.push(obj[i]);
+                stringify[str] = true;
+            }
+        }
+        uniques = uniques;
+        return uniques;
+    },
+    throttle(func, wait) {
+        //节流
+        let timer = null;
+        let fn = function() {
+            if (!timer) {
+                let args = Array.from(arguments);
+                timer = setTimeout(() => {
+                    func.apply(this, args);
+                    timer = null;
+                }, wait);
+            }
+        };
+        return fn;
+    },
+    shake(func, t) {
+        //防抖
+        let fn = function() {
+            let args = Array.from(arguments);
+            clearTimeout(func.id);
+            func.id = setTimeout(() => {
+                func.apply(this, args);
+            }, t);
+        };
+        return fn;
+    },
+    objToParams(obj) {
+        let result = '';
+        for (let i in obj) {
+            result += `&${i}=${obj[i]}`;
+        }
+        result = '?' + result.substr(1, result.length - 1);
+        return result;
+    },
+    computedForm(array, header) {
+        const result = array.reduce((pre, cur) => {
+            const data = header.filter(
+                (row) => cur.is_show && row.serverName == cur.key
+            );
+            if (data && data.length == 1) {
+                return pre.concat(data);
+            } else {
+                return pre;
+            }
+        }, []);
+        return result;
+    },
+    computedHeader(array, header) {
+        const result = array.reduce((pre, cur) => {
+            const data = header.filter((row) => (cur.is_show && row.key == cur.key) && (row.title = cur.value));
+            console.log('data :>> ', data);
+            if (data && data.length == 1) {
+                return pre.concat(data);
+            } else {
+                return pre;
+            }
+        }, []);
+        return result;
+    },
+};

src/views/BidSystem/DeepeningOrder/list.vue

@@ -1,36 +1,41 @@
 <template>
   <div class="BidsList">
-    <FullPage title='深化单'
-              :list='set_list'
-              @init='init'
-              :loading='loading'
-              @searchData='init'
-              @selectTable='selectTable'
-              @changePage='changePage'
-              @changeSize='changeSize'
-              :tableColums='tableColums'
-              :showPage='false'
-              :tableData='tableData'
-              :page_index='page_index'
-              :total='total'>
-      <div slot='titleButton'
-           style="display:flex;">
-        <Upload name='your_file'
-                :show-upload-list='false'
-                :headers='headers'
-                :on-error='uploadError'
-                :on-success='uploadSuccess'
-                :action="$store.state.ip+'/api/order_area_product_import'">
-          <Button type="success"
-                  ghost
-                  icon='md-exit'
-                  style="margin-right:10px;">导入</Button>
+    <FullPage
+      title="深化单"
+      :list="set_list"
+      @init="init"
+      :loading="loading"
+      @searchData="init"
+      @selectTable="selectTable"
+      @changePage="changePage"
+      @changeSize="changeSize"
+      :tableColums="tableColums"
+      :showPage="false"
+      :tableData="tableData"
+      :page_index="page_index"
+      :total="total"
+    >
+      <div slot="titleButton" style="display: flex">
+        <Upload
+          name="your_file"
+          :show-upload-list="false"
+          :headers="headers"
+          :on-error="uploadError"
+          :on-success="uploadSuccess"
+          :action="$store.state.ip + '/api/order_area_product_import'"
+        >
+          <Button type="success" ghost icon="md-exit" style="margin-right: 10px"
+            >导入</Button
+          >
         </Upload>
-        <Button @click="exportData"
-                type="warning"
-                ghost
-                icon='md-return-left'
-                style="margin-right:10px;">导出</Button>
+        <Button
+          @click="exportData"
+          type="warning"
+          ghost
+          icon="md-return-left"
+          style="margin-right: 10px"
+          >导出</Button
+        >
       </div>
       <!-- <div slot='navButton'
            style="display:flex;">
@@ -40,76 +45,104 @@
                 ghost
                 icon='ios-cog'>表头设置</Button>
       </div> -->
-      <template slot="basicTypeSet"
-                slot-scope="{row}">
+      <template slot="basicTypeSet" slot-scope="{ row }">
         <div>
-          <span v-for="item in warningList"
-                :key="item.id"
-                :style="{color:item.color}"
-                v-show="item.id==row.warning_state">{{item.title}}</span>
+          <span
+            v-for="item in warningList"
+            :key="item.id"
+            :style="{ color: item.color }"
+            v-show="item.id == row.warning_state"
+            >{{ item.title }}</span
+          >
         </div>
       </template>
-      <template slot='set'
-                slot-scope='{row,index}'>
+      <template slot="set" slot-scope="{ row, index }">
         <div>
-          <a style="margin:0 5px"
-             :disabled="row.sub_status!=1"
-             @click="handleSet(row,index,1)">下拆单</a>
-          <a style="margin:0 5px"
-             :disabled="row.sub_status!=1"
-             @click="handleSet(row,index,2)">编辑</a>
-          <a style="margin:0 5px"
-             @click="handleSet(row,index,3)">详情</a>
-          <a style="margin:0 5px"
-             :disabled="row.sub_status!=1"
-             @click="handleSet(row,index,4)">变更</a>
-          <a style="margin:0 5px;color:orange"
-             @click="handleSet(row,index,5)">变更记录</a>
-          <a style="margin:0 5px"
-             @click="handleSet(row,index,6)">数据对比</a>
+          <a
+            style="margin: 0 5px"
+            :disabled="row.sub_status != 1"
+            @click="handleSet(row, index, 1)"
+            >下拆单</a
+          >
+          <a
+            style="margin: 0 5px"
+            :disabled="row.sub_status != 1"
+            @click="handleSet(row, index, 2)"
+            >编辑</a
+          >
+          <a style="margin: 0 5px" @click="handleSet(row, index, 3)">详情</a>
+          <a
+            style="margin: 0 5px"
+            :disabled="row.sub_status != 1"
+            @click="handleSet(row, index, 4)"
+            >变更</a
+          >
+          <a
+            style="margin: 0 5px; color: orange"
+            @click="handleSet(row, index, 5)"
+            >变更记录</a
+          >
+          <a style="margin: 0 5px" @click="handleSet(row, index, 6)"
+            >数据对比</a
+          >
         </div>
       </template>
       <template slot="pageSlot">
         <div class="pageSlotStyle">
-          <Page :page-size-opts="[10, 20, 30, 40,100,1000]"
-                @on-page-size-change='changeSize'
-                @on-change='changePage'
-                :current='page_index'
-                show-total
-                :total="total"
-                show-sizer
-                :page-size='page_size' />
+          <Page
+            :page-size-opts="[10, 20, 30, 40, 100, 1000]"
+            @on-page-size-change="changeSize"
+            @on-change="changePage"
+            :current="page_index"
+            show-total
+            :total="total"
+            show-sizer
+            :page-size="page_size"
+          />
         </div>
       </template>
     </FullPage>
-    <Modal v-model="processModal"
-           title="确认？"
-           @on-ok="handleProcess"
-           @on-cancel="processModal=false">
+    <Modal v-model="processModal" title="确认？">
       <div>
         <div class="process_modal">
           <span>拆单人员:</span>
-          <Select v-model="process_man"
-                  style="width: 150px">
-            <Option v-for="item in processManList"
-                    :key="item.id"
-                    :label='item.nickname'
-                    :value='item.id'></Option>
+          <Select v-model="process_man" style="width: 150px">
+            <Option
+              v-for="item in processManList"
+              :key="item.id"
+              :label="item.nickname"
+              :value="item.id"
+            ></Option>
           </Select>
         </div>
         <div class="process_modal">
           <span>选择时间:</span>
-          <DatePicker type="date"
-                      v-model="process_start_time"
-                      placeholder="年/月/日"
-                      style="width: 150px"></DatePicker>
+          <DatePicker
+            type="date"
+            v-model="process_start_time"
+            placeholder="年/月/日"
+            style="width: 150px"
+          ></DatePicker>
           至
-          <DatePicker type="date"
-                      v-model="process_end_time"
-                      placeholder="年/月/日"
-                      style="width: 150px"></DatePicker>
+          <DatePicker
+            type="date"
+            v-model="process_end_time"
+            placeholder="年/月/日"
+            style="width: 150px"
+          ></DatePicker>
         </div>
       </div>
+      <div slot="footer">
+        <Button
+          @click="processModal = false"
+          type="primary"
+          style="margin-right: 10px"
+          >取消</Button
+        >
+        <Button @click="handleProcess" type="primary" style="margin-right: 10px"
+          >确定</Button
+        >
+      </div>
     </Modal>
   </div>
 </template>
@@ -119,44 +152,105 @@
 // 例如：import 《组件名称》 from '《组件路径》';
 
 export default {
-  name: 'BidSystemContractList',
-  data () {
+  name: "BidSystemContractList",
+  data() {
     // 这里存放数据
     return {
       tableColums: [
-        { type: 'selection', align: 'center', key: 'selection', minWidth: 100, fixed: 'left', title: '全选' },
-        { title: '订单号', align: 'center', key: 'order_no', minWidth: 150 },
-        { title: '小区名称', align: 'center', key: 'residential_name', minWidth: 120 },
-        { title: '详细地址', align: 'center', key: 'address', minWidth: 200 },
+        {
+          type: "selection",
+          align: "center",
+          key: "selection",
+          minWidth: 100,
+          fixed: "left",
+          title: "全选",
+        },
+        { title: "订单号", align: "center", key: "order_no", minWidth: 150 },
+        {
+          title: "小区名称",
+          align: "center",
+          key: "residential_name",
+          minWidth: 120,
+        },
+        { title: "详细地址", align: "center", key: "address", minWidth: 200 },
         // {
         //   title: '订单类型', align: 'center', key: 'renovation_type', minWidth: 100,
         //   render: (h, params) => h('span', {}, params.row.renovation_type == 1 ? '工装' : '家装')
         // },
-        { title: '客户姓名', align: 'center', key: 'client_name', minWidth: 120 },
-        { title: '手机号', align: 'center', key: 'mobile', minWidth: 150 },
-        { title: '紧急程度', align: 'center', key: 'warning_state', minWidth: 100, slot: 'basicTypeSet', },
         {
-          title: '收款', align: 'center', key: 'pay_state', minWidth: 80,
-          render: (h, params) => h('span', {}, params.row.pay_state == 1 ? '已收款' : '未收款')
+          title: "客户姓名",
+          align: "center",
+          key: "client_name",
+          minWidth: 120,
         },
-        { title: '业务员', align: 'center', key: 'salesman', minWidth: 100 },
+        { title: "手机号", align: "center", key: "mobile", minWidth: 150 },
         {
-          title: '开始日期', align: 'center', key: 'start_time', minWidth: 150,
-          render: (h, params) => h('span', {}, this.func.replaceDateNoHMS(params.row.start_time))
+          title: "紧急程度",
+          align: "center",
+          key: "warning_state",
+          minWidth: 100,
+          slot: "basicTypeSet",
         },
         {
-          title: '交付日期', align: 'center', key: 'end_time', minWidth: 150,
-          render: (h, params) => h('span', {}, this.func.replaceDateNoHMS(params.row.end_time))
+          title: "收款",
+          align: "center",
+          key: "pay_state",
+          minWidth: 80,
+          render: (h, params) =>
+            h("span", {}, params.row.pay_state == 1 ? "已收款" : "未收款"),
         },
+        { title: "业务员", align: "center", key: "salesman", minWidth: 100 },
         {
-          title: '订单状态', align: 'center', key: 'state', minWidth: 100,
-          render: (h, params) => h('span', {}, params.row.state == 0 ? '待审核' : params.row.warning_state == 1 ? '待拆单' : params.row.warning_state == 2 ? '待生产' : '已完成')
+          title: "开始日期",
+          align: "center",
+          key: "start_time",
+          minWidth: 150,
+          render: (h, params) =>
+            h("span", {}, this.func.replaceDateNoHMS(params.row.start_time)),
         },
         {
-          title: '下单日期', align: 'center', key: 'crt_time', minWidth: 150,
-          render: (h, params) => h('span', {}, this.func.replaceDateNoHMS(params.row.crt_time))
+          title: "交付日期",
+          align: "center",
+          key: "end_time",
+          minWidth: 150,
+          render: (h, params) =>
+            h("span", {}, this.func.replaceDateNoHMS(params.row.end_time)),
+        },
+        {
+          title: "订单状态",
+          align: "center",
+          key: "state",
+          minWidth: 100,
+          render: (h, params) =>
+            h(
+              "span",
+              {},
+              params.row.state == 0
+                ? "待审核"
+                : params.row.warning_state == 1
+                ? "待拆单"
+                : params.row.warning_state == 2
+                ? "待生产"
+                : "已完成"
+            ),
+        },
+        {
+          title: "下单日期",
+          align: "center",
+          key: "crt_time",
+          minWidth: 150,
+          render: (h, params) =>
+            h("span", {}, this.func.replaceDateNoHMS(params.row.crt_time)),
+        },
+        {
+          title: "操作",
+          align: "center",
+          key: "set",
+          slot: "set",
+          fixed: "right",
+          minWidth: 350,
+          fixed: "right",
         },
-        { title: '操作', align: 'center', key: 'set', slot: 'set', fixed: 'right', minWidth: 350, fixed: 'right' },
       ],
       tableData: [],
       page_index: 1,
@@ -164,49 +258,63 @@ export default {
       total: 0,
       loading: false,
       proxyObj: {},
-      headers: { 'Authorization': localStorage.getItem('token') },
+      headers: { Authorization: localStorage.getItem("token") },
       selects: [],
       processModal: false,
-      process_man: '',
+      process_man: "",
       processManList: [],
-      process_start_time: '',
-      process_end_time: '',
-      order_no: '',
+      process_start_time: "",
+      process_end_time: "",
+      order_no: "",
       warningList: [],
-    }
+    };
   },
   // 生命周期 - 创建完成（可以访问当前this实例）
-  created () {
+  created() {
     // 获取紧急程度
-    this.axios.get('/api/warning_list').then(res => { this.warningList = res.data.data })
+    this.axios.get("/api/warning_list").then((res) => {
+      this.warningList = res.data.data;
+    });
+    // 获取用户列表
+    this.axios({ method: "get", url: "/api/user" }).then((res) => {
+      this.processManList = res.data.data;
+    });
   },
   // 生命周期 - 挂载完成（可以访问DOM元素）
-  mounted () {
-
-  },
+  mounted() {},
   methods: {
-    handleProcess () {
-      this.axios({
-        method: 'get',
-        url: '/api/order_area_pull',
-        params: {
-          order_no: this.order_no,
-          sub_status: 2,
-          process_man: this.process_man,
-          process_start_time: this.func.replaceDateNoHMS(this.process_start_time),
-          process_end_time: this.func.replaceDateNoHMS(this.process_end_time),
-        }
-      }).then((res) => {
-        this.$Message.success(res.msg)
-        this.getData(this.proxyObj)
-      }).catch((err) => { });
+    handleProcess() {
+      if (
+        this.process_man &&
+        this.process_end_time &&
+        this.process_start_time
+      ) {
+        this.axios({
+          method: "get",
+          url: "/api/order_area_pull",
+          params: {
+            order_no: this.order_no,
+            sub_status: 2,
+            process_man: this.process_man,
+            process_start_time: this.func.replaceDateNoHMS(
+              this.process_start_time
+            ),
+            process_end_time: this.func.replaceDateNoHMS(this.process_end_time),
+          },
+        }).then((res) => {
+          this.$Message.success(res.msg);
+          this.getData(this.proxyObj);
+        });
+      } else {
+        this.$Message.warning("信息请填写完整");
+      }
     },
     //1下拆单 2编辑 3详情 4变更 5变更记录 6数据对比
-    handleSet (row, index, type) {
+    handleSet(row, index, type) {
       switch (type) {
         case 1:
-          this.processModal = true
-          this.order_no = row.order_no
+          this.processModal = true;
+          this.order_no = row.order_no;
           // this.$Modal.confirm({
           //   title: '确认拆单？',
           //   content: '确认后订单将下至拆单，请确认！',
@@ -231,12 +339,12 @@ export default {
         case 2:
         case 3:
           this.$router.push({
-            path: '/cms/BidSystem/DeepeningOrder/detail',
+            path: "/cms/BidSystem/DeepeningOrder/detail",
             query: {
               type,
-              order_no: row.order_no
-            }
-          })
+              order_no: row.order_no,
+            },
+          });
           break;
         case 4:
           break;
@@ -244,96 +352,135 @@ export default {
           break;
         case 6:
           this.$router.push({
-            path: '/cms/BidSystem/DeepeningOrder/compare',
+            path: "/cms/BidSystem/DeepeningOrder/compare",
             query: {
               type,
-              order_no: row.order_no
-            }
-          })
+              order_no: row.order_no,
+            },
+          });
           break;
       }
     },
-    init (row) {
-      this.page_index = 1
+    init(row) {
+      this.page_index = 1;
       //1 深化
-      row.sub_status = 1
+      row.sub_status = 1;
       row.page_index = this.page_index;
       row.page_size = this.page_size;
-      this.proxyObj = row
-      this.getData(row)
+      this.proxyObj = row;
+      this.getData(row);
     },
-    getData (row) {
+    getData(row) {
       this.loading = true;
-      this.axios('/api/order_area', { params: row }).then(res => {
+      this.axios("/api/order_area", { params: row }).then((res) => {
         this.loading = false;
         this.tableData = res.data.data;
         this.total = res.data.total;
-        this.tableheaders = res.data.tableSet || []
-      })
+        this.tableheaders = res.data.tableSet || [];
+      });
     },
-    changePage (e) {
+    changePage(e) {
       this.page_index = e;
       this.proxyObj.page_index = this.page_index;
-      this.getData(this.proxyObj)
+      this.getData(this.proxyObj);
     },
-    changeSize (e) {
+    changeSize(e) {
       this.page_size = e;
       this.proxyObj.page_size = this.page_size;
-      this.getData(this.proxyObj)
+      this.getData(this.proxyObj);
     },
-    async exportData () {
-      const res = await this.axios('/api/measure_orders_export', { params: { ...this.proxyObj } })
+    async exportData() {
+      const res = await this.axios("/api/measure_orders_export", {
+        params: { ...this.proxyObj },
+      });
       if (res.code == 200) {
-        let url = `${this.$store.state.ip}/api/storage/${res.data.file}`
-        location.href = url
+        let url = `${this.$store.state.ip}/api/storage/${res.data.file}`;
+        location.href = url;
       }
     },
-    uploadSuccess (res) {
+    uploadSuccess(res) {
       if (res.code == 200) {
-        this.$Message.success(res.msg || '上传成功')
+        this.$Message.success(res.msg || "上传成功");
       } else {
-        this.$Message.warning(res.msg || '上传失败')
+        this.$Message.warning(res.msg || "上传失败");
       }
-      this.getData(this.proxyObj)
+      this.getData(this.proxyObj);
     },
-    uploadError (err) {
-      this.$Message.error(err.msg || '上传失败')
+    uploadError(err) {
+      this.$Message.error(err.msg || "上传失败");
     },
-    selectTable (e) {
+    selectTable(e) {
       this.selects = e;
     },
   },
   // 监听属性 类似于data概念
   computed: {
-    set_list () {
+    set_list() {
       return [
-        { title: '订单编号', serverName: 'order_no', name: 'Input', value: '', placeholder: '请输入订单号' },
-        { title: '小区名字', name: 'Input', placeholder: '请输入', value: '', serverName: 'residential_name' },
-        { title: '客户昵称', name: 'Input', placeholder: '请输入', value: '', serverName: 'client_name' },
-        { title: '手机号', name: 'Input', placeholder: '请输入', value: '', serverName: 'mobile' },
         {
-          title: '订单状态', name: 'Select', placeholder: '请选择', serverName: 'state', value: '',
+          title: "订单编号",
+          serverName: "order_no",
+          name: "Input",
+          value: "",
+          placeholder: "请输入订单号",
+        },
+        {
+          title: "小区名字",
+          name: "Input",
+          placeholder: "请输入",
+          value: "",
+          serverName: "residential_name",
+        },
+        {
+          title: "客户昵称",
+          name: "Input",
+          placeholder: "请输入",
+          value: "",
+          serverName: "client_name",
+        },
+        {
+          title: "手机号",
+          name: "Input",
+          placeholder: "请输入",
+          value: "",
+          serverName: "mobile",
+        },
+        {
+          title: "订单状态",
+          name: "Select",
+          placeholder: "请选择",
+          serverName: "state",
+          value: "",
           option: [
-            { label: '待审核', value: 0 },
-            { label: '待拆单', value: 1 },
-            { label: '待生产', value: 2 },
-            { label: '已完成', value: 3 },
-          ]
+            { label: "待审核", value: 0 },
+            { label: "待拆单", value: 1 },
+            { label: "待生产", value: 2 },
+            { label: "已完成", value: 3 },
+          ],
         },
-        { title: '紧急程度', name: 'Select', serverName: 'warning_state', placeholder: '请选择', value: '', optionName: 'title', optionValue: 'id', option: this.warningList },
-      ]
-    }
+        {
+          title: "紧急程度",
+          name: "Select",
+          serverName: "warning_state",
+          placeholder: "请选择",
+          value: "",
+          optionName: "title",
+          optionValue: "id",
+          option: this.warningList,
+        },
+      ];
+    },
   },
   // 监控data中的数据变化
   watch: {},
-  beforeCreate () { }, // 生命周期 - 创建之前
-  beforeMount () { }, // 生命周期 - 挂载之前
-  beforeUpdate () { }, // 生命周期 - 更新之前
-  updated () { }, // 生命周期 - 更新之后
-  beforeDestroy () { }, // 生命周期 - 销毁之前
-  destroyed () { }, // 生命周期 - 销毁完成
-  activated () { }, // 如果页面有keep-alive缓存功能，这个函数会触发
-}
+  beforeCreate() {}, // 生命周期 - 创建之前
+  beforeMount() {}, // 生命周期 - 挂载之前
+  beforeUpdate() {}, // 生命周期 - 更新之前
+  updated() {}, // 生命周期 - 更新之后
+  beforeDestroy() {}, // 生命周期 - 销毁之前
+  destroyed() {}, // 生命周期 - 销毁完成
+  activated() {}, // 如果页面有keep-alive缓存功能，这个函数会触发
+};
 </script>
 
 <style lang='scss' scoped>

src/views/BidSystem/ProductDeOrder/deorderdetail.vue

@@ -1212,7 +1212,6 @@ export default {
         },
       })
         .then((res) => {
-          console.log("1 :>> ", 1);
           this.formData = res.data;
           this.formData.basic_product_id = 8;
           // 获取产品分类、测量字段
@@ -1234,7 +1233,9 @@ export default {
                 process_price: "", //工艺价格
                 proportion: "", //产值比例
                 properties: [], //工艺属性
-                ProcessAttrList: this.tempProcessAttrList, //工艺属性列表
+                ProcessAttrList: JSON.parse(
+                  JSON.stringify(this.tempProcessAttrList)
+                ), //工艺属性列表
                 partsProcessLineTableData: [], //工艺路线表格
                 partsWoodTableData: [
                   {
@@ -1466,7 +1467,7 @@ export default {
               element.proportion = element.ratio;
               element.thick = element.formula_h;
               element.long = element.formula_l;
-              element.ProcessAttrList = this.tempProcessAttrList; //工艺属性列表
+              element.ProcessAttrList = JSON.parse(JSON.stringify(this.tempProcessAttrList)); //工艺属性列表
               this.axios("/api/parts_detail", {
                 params: { id: element.part_id },
               })
@@ -1543,7 +1544,7 @@ export default {
     },
     //新增工艺组合名称
     handleProcessRouteCreate(item, val) {
-      item.ProcessAttrList = this.tempProcessAttrList;
+      item.ProcessAttrList = JSON.parse(JSON.stringify(this.tempProcessAttrList));
       item.partsProcessRouteList.push({
         id: val,
         title: val,
@@ -1758,7 +1759,7 @@ export default {
         company: "", //单位
         processCombination: "", //工艺组合名称
         process_price: "", //工艺价格
-        ProcessAttrList: this.tempProcessAttrList, //工艺属性列表
+        ProcessAttrList: JSON.parse(JSON.stringify(this.tempProcessAttrList)), //工艺属性列表
         partsProcessLineTableData: [
           {
             id: "",
@@ -2320,7 +2321,7 @@ export default {
   }
 }
 /deep/.ivu-modal-body {
-  height: 800px;
+  height: 700px;
   overflow: auto;
 }
 </style>

src/views/OrderMannage/BusinessOrderlist/list.vue

@@ -624,6 +624,7 @@ export default {
               props: {
                 value: currentRow.value,
                 type: "text",
+                readonly: currentRow.value == "全选" ? true : false,
               },
               on: {
                 "on-change": (e) => {