yusheng 1 năm trước cách đây
mục cha
commit
bf8b0cac27

+ 8 - 1
src/enum/dict.js

@@ -84,7 +84,13 @@ export const reviewStatus = {
   2: '已审核',
   3: '审核不通过'
 };
-
+//审核下拉
+export const reviewStatusSelect = [
+  {value:0,label:'未提交'},
+  {value:1,label:'审核中'},
+  {value:2,label:'已审核'},
+  {value:3,label:'审核不通过'},
+];
 //报价单-是否接受拆单
 export const acceptUnpackoptions = [
   { label: '接受', value: 1 },
@@ -140,6 +146,7 @@ export const purchasePlanProgressStatusEnum = [
   { value: 0, label: '未开始' },
   { value: 100, label: '待核价' },
   { value: 101, label: '核价中' },
+  { value: 103, label: '部分核价' },
   { value: 102, label: '核价完成' },
   { value: 200, label: '在途' },
   { value: 201, label: '部分入库' },

+ 1 - 6
src/views/purchasingManage/inquiryManage/components/detailDialog.vue

@@ -72,12 +72,7 @@
           <el-col :span="8">
             <el-form-item prop="askFile" label="附件:">
               <fileMain v-model="form.files" type="view"></fileMain>
-<!--              <el-link-->
-<!--                v-if="form.files && form.files !== ''"-->
-<!--                type="primary"-->
-<!--                :underline="false"-->
-<!--                @click="downloadFile(form.files)">-->
-<!--                {{ form.files.name }}</el-link>-->
+
             </el-form-item>
           </el-col>
         </el-row>

+ 26 - 0
src/views/purchasingManage/purchaseOrder/components/searchTable.vue

@@ -3,6 +3,8 @@
   <seekPage :seekList="seekList" :formLength="4" @search="search"></seekPage>
 </template>
 <script>
+  import { reviewStatusSelect,purchaseOrderProgressStatusEnum,requirementSourceType} from '@/enum/dict';
+
   export default {
     data() {
       return {};
@@ -35,6 +37,30 @@
             type: 'input',
             placeholder: ''
           },
+          {
+            label: '订单类型',
+            value: 'sourceType',
+            type: 'select',
+            planList: requirementSourceType,
+            width: 380,
+            placeholder: ''
+          },
+          {
+            label: '审核状态',
+            value: 'orderStatus',
+            type: 'select',
+            planList: reviewStatusSelect,
+            width: 380,
+            placeholder: ''
+          },
+          {
+            label: '订单进度',
+            value: 'progress',
+            type: 'select',
+            planList: purchaseOrderProgressStatusEnum,
+            width: 380,
+            placeholder: ''
+          },
           {
             label: '创建时间:',
             value: 'createTime',

+ 3 - 2
src/views/purchasingManage/purchasePlanManage/index.vue

@@ -210,7 +210,8 @@
                 v-if="
                   [2].includes(row.status) &&
                   !row.isCut &&
-                  !(row.inquiryCount * 1)
+                  !(row.inquiryCount * 1)&&
+                  [0, 100, 101,103].includes(row.progress)
                 "
                 @click="handleSplit(row)"
               >
@@ -236,7 +237,7 @@
                   [2].includes(row.status) &&
                   (!row.isCut || (row.parentId && row.parentId != 0)) &&
                   isAddInquiry != 0 &&
-                  [0, 100, 101].includes(row.progress)
+                  [0, 100, 101,103].includes(row.progress)
                 "
                 icon="el-icon-plus"
                 @click="addInquiry('add', row)"

+ 41 - 7
src/views/saleManage/saleOrder/components/searchTable.vue

@@ -3,6 +3,7 @@
   <seekPage :seekList="seekList" :formLength="4" @search="search"></seekPage>
 </template>
 <script>
+  import { reviewStatusSelect,saleOrderProgressStatusEnum } from '@/enum/dict';
   export default {
     data() {
       return {};
@@ -35,6 +36,46 @@
             type: 'input',
             placeholder: ''
           },
+
+          {
+            label: '项目名称:',
+            value: 'productCode',
+            type: 'input',
+            width: 380,
+            placeholder: ''
+          },
+          {
+            label: '订单类型',
+            value: 'needProduce',
+            type: 'select',
+            planList: [
+              {
+                label: '生产性订单',
+                value: '1'
+              },
+              { label: '无客户生产性订单', value: '2' },
+              { label: '库存式订单', value: '0' },
+              { label: '不定向订单', value: '4' }
+            ],
+            width: 380,
+            placeholder: ''
+          },
+          {
+            label: '审核状态',
+            value: 'orderStatus',
+            type: 'select',
+            planList: reviewStatusSelect,
+            width: 380,
+            placeholder: ''
+          },
+          {
+            label: '订单进度',
+            value: 'progress',
+            type: 'select',
+            planList:saleOrderProgressStatusEnum,
+            width: 380,
+            placeholder: ''
+          },
           {
             label: '创建时间:',
             value: 'createTime',
@@ -43,13 +84,6 @@
             placeholder: '',
             width: 380,
             valueAr: ['createTimeStart', 'createTimeEnd']
-          },
-          {
-            label: '项目名称:',
-            value: 'productCode',
-            type: 'input',
-            width: 380,
-            placeholder: ''
           }
         ];
       }