九方优化

src/views/Approval/list.vue

@@ -49,12 +49,14 @@ export default {
   data () {
     return {
       list: [
-        { title: '订单号', name: 'Input', value: '', serverName: 'order_no', placeholder: '请输入订单号' },
+        { title: '订单号', name: 'Input', value: '', serverName: 'oa_order_no', placeholder: '请输入订单号' },
+        { title: '小区名称', name: 'Input', serverName: 'residential_name', value: '', placeholder: '请输入小区名称' },
+        { title: '提交人', name: 'Input', serverName: 'nickname', value: '', placeholder: '请选择提交人' },
         {
           title: '审批状态', name: 'Select', placeholder: '请选择', value: '', serverName: 'state',
           option: [
-            { label: '待审批', value: 0 },
-            { label: '同意', value: 1 },
+            { label: '审核中', value: 0 },
+            { label: '通过', value: 1 },
             { label: '驳回', value: 2 },
             // { label: '取消', value: 3 },
           ]
@@ -62,29 +64,32 @@ export default {
         {
           title: '审批类型', name: 'Select', serverName: 'type', placeholder: '请选择', value: '',
           option: [
-            { label: '测量', value: 1 },
-            { label: '生产', value: 2 }
+            { label: '请购', value: 1 },
+            { label: '采购', value: 2 },
+            { label: '到货', value: 3 },
+            { label: '质检', value: 4 }
           ]
         },
-        { title: '创建人员', name: 'Input', serverName: 'nickname', value: '', placeholder: '请输入创建人员' },
-        { title: '手机号', name: 'Input', serverName: 'mobile', value: '', placeholder: '请输入手机号' },
+      
         // { title: '审批时间', start_server: 'start_time', end_server: 'end_time', name: 'Input', start_value: '', end_value: '', isDate: true, start_placeholder: '开始日期', end_placeholder: '结束日期', },
       ],
       tableColums: [
         { type: 'selection', align: 'center', fixed: 'left', minWidth: 100, },
-        { title: '订单编号', align: 'center', key: 'order_no', width: '180' },
-        { title: '订单流水号', align: 'center', key: 'oa_order_no', minWidth: 200 },
+        { title: '订单号', align: 'center', key: 'oa_order_no', width: '180' },
+        { title: '小区名称', align: 'center', key: 'residential_name', minWidth: 100 },
+        // { title: '订单流水号', align: 'center', key: 'oa_order_no', minWidth: 200 },
         // {title:'订单类型',align:'center',key:'show_order_type',minWidth:100,
         //     render:(h,params)=>h('span',{},params.row.order_type == 1 ? '工装' : '家装')
         // },
-        { title: '客户', align: 'center', key: 'client_name', minWidth: 100 },
-        { title: '手机号', align: 'center', key: 'mobile', minWidth: 150 },
+        // { title: '客户', align: 'center', key: 'client_name', minWidth: 100 },
+        // { title: '手机号', align: 'center', key: 'mobile', minWidth: 150 },
         {
           title: '审批类型', align: 'center', minWidth: 100,
           render (h, params) {
             return h('span', {}, params.row.type == 1 ? '测量' : '生产')
           }
         },
+        { title: '提交人', align: 'center', key: 'nickname', minWidth: 100 },
         {
           title: '审批状态', align: 'center', key: 'show_state', minWidth: 100,
           render (h, params) {
@@ -96,16 +101,20 @@ export default {
             }, params.row.state == 0 ? '待审批' : (params.row.state == 1 ? '同意' : (params.row.state == 2 ? '驳回' : '取消')))
           }
         },
-        { title: '创建人员', align: 'center', key: 'nickname', minWidth: 100 },
         {
-          title: '审批开始时间', align: 'center', key: 'show_crt_time', minWidth: 200,
+          title: '提交日期', align: 'center', key: 'show_crt_time', minWidth: 200,
           render: (h, params) => h('span', {}, this.func.replaceDate(params.row.crt_time * 1))
         },
-        {
-          title: '审批结束时间', align: 'center', key: 'show_upd_time', minWidth: 200,
-          render: (h, params) => h('span', {}, params.row.upd_time ? this.func.replaceDate(params.row.upd_time * 1) : '')
-        },
-        { title: '备注', align: 'center', key: 'remark', minWidth: 200 },
+        // { title: '创建人员', align: 'center', key: 'nickname', minWidth: 100 },
+        // {
+        //   title: '审批开始时间', align: 'center', key: 'show_crt_time', minWidth: 200,
+        //   render: (h, params) => h('span', {}, this.func.replaceDate(params.row.crt_time * 1))
+        // },
+        // {
+        //   title: '审批结束时间', align: 'center', key: 'show_upd_time', minWidth: 200,
+        //   render: (h, params) => h('span', {}, params.row.upd_time ? this.func.replaceDate(params.row.upd_time * 1) : '')
+        // },
+        // { title: '备注', align: 'center', key: 'remark', minWidth: 200 },
         { title: '操作', align: 'center', slot: 'set', fixed: 'right', width: '220' },
       ],
       tableData: [],

src/views/BasicSettings/SuppliersManage/SippliersStockPriceListEdit.vue

@@ -17,7 +17,7 @@
     </Toptitle>
     <div class="content">
       <div class="content_top">
-        <div><span>供应商编码1:</span>
+        <div><span>供应商编码:</span>
           <Select v-model="searchData.id"
                   :disabled="$route.query.type!=1"
                   size="small"
@@ -59,15 +59,18 @@
                     slot-scope="{index}">
             <Input type="text"
                    size="small"
+                   v-if="$route.query.type!=3"
                    @on-change="handlePriceChange(tableData[index],index)"
                    v-model="tableData[index].price"
                    placeholder="无税单价" />
+                  <span v-else>{{tableData[index].price}}</span>
           </template>
           <template slot="setSlot"
                     slot-scope="{row,index}">
-            <!-- <a style="margin:0 5px"
+            <!-- <a style="margin:0 5px
                @click="handleSet(2,row,index)">编辑</a> -->
             <a style="margin:0 5px;color:red"
+               :disabled="$route.query.type==3"
                @click="handleSet(3,row,index)">删除</a>
           </template>
         </Table>

src/views/BidSystem/ProductDeOrder/list.vue

@@ -102,7 +102,7 @@
     </FullPage>
     <Modal
       v-model="processModal"
-      title="下生产？"
+      title="下生产"
       @on-ok="handleProcess"
       @on-cancel="processModal = false"
     >

src/views/PurchasingManage/ArrivalOrder/list.vue

@@ -101,12 +101,13 @@
             <a style="margin:0 5px"
                @click="handleSet(2,row,index)">详情</a>
             <a style="margin:0 5px"
-               :disabled="row.state==1"
+               :disabled="row.state==1||row.state==2"
                @click="handleSet(3,row,index)">编辑</a>
             <a style="margin:0 5px"
                :disabled="row.state==1||row.state==2"
                @click="handleSet(4,row,index)">删除</a>
             <a style="margin:0 5px"
+               :disabled="row.state==1||row.state==2"
                @click="handleSet(5,row,index)">提交</a>
           </template>
         </Table>
@@ -213,6 +214,8 @@ export default {
         url: '/api/purchase_arrive_list',
         params: {
           ...obj,
+          page_index: this.pageIndex,
+          page_size: this.pageSize
         }
       }).then((res) => {
         this.tableData = res.data.data

src/views/PurchasingManage/PurchasingOrder/list.vue

@@ -120,7 +120,7 @@
             <a style="margin:0 5px"
                @click="handleSet(2,row,index)">详情</a>
             <a style="margin:0 5px"
-               :disabled="row.state==1"
+               :disabled="row.state==1||row.state==2"
                @click="handleSet(3,row,index)">编辑</a>
             <a style="margin:0 5px"
                :disabled="row.state==1||row.state==2"

src/views/PurchasingManage/QualitycontrolOrder/list.vue

@@ -39,7 +39,7 @@
                     :label="_item.title"></Option>
           </Select>
         </FormItem> -->
-        <FormItem label="业务员:">
+        <!-- <FormItem label="业务员:">
           <Select v-model="searchData.man"
                   size="small"
                   clearable
@@ -50,7 +50,7 @@
                     :value="sitem.id">
             </Option>
           </Select>
-        </FormItem>
+        </FormItem> -->
         <FormItem label="提交人:">
           <Select v-model="searchData.user_id"
                   size="small"
@@ -115,7 +115,7 @@
             <a style="margin:0 5px"
                @click="handleSet(2,row,index)">详情</a>
             <a style="margin:0 5px"
-               :disabled="row.state==1"
+               :disabled="row.state==1||row.state==2"
                @click="handleSet(3,row,index)">编辑</a>
             <a style="margin:0 5px"
                :disabled="row.state==1||row.state==2"

src/views/PurchasingManage/RequisitionOrder/list.vue

@@ -114,13 +114,13 @@
             <a style="margin:0 5px"
                @click="handleSet(2,row,index)">详情</a>
             <a style="margin:0 5px"
-               :disabled="row.state==1"
+               :disabled="row.state==1||row.state==2"
                @click="handleSet(3,row,index)">编辑</a>
             <a style="margin:0 5px"
                :disabled="row.state==1||row.state==2"
                @click="handleSet(4,row,index)">删除</a>
             <a style="margin:0 5px"
-               :disabled="row.state==2"
+               :disabled="row.state==1||row.state==2"
                @click="handleSet(5,row,index)">提交</a>
           </template>
         </Table>