委外场景

src/enum/dict.js

@@ -149,3 +149,15 @@ export const relationType= {
   1: '收货确认单',
 
 }
+
+//委外订单来源类型
+
+export const orderSourceType = ['3', '4', '5', '6', '7'];
+
+//委外场景
+export const outsourceSceneList = [
+  { value: 1, label: '首工序委外' },
+  { value: 2, label: '单工序' },
+  { value: 3, label: '多工序' },
+  { value: 4, label: '首工序及多工序' }
+];

src/views/bpm/handleTask/components/purchaseOrder/addDialog.vue

@@ -84,30 +84,7 @@
               placeholder="请输入"
             />
           </el-form-item>
-          <!-- <el-form-item
-            label="交货日期"
-            prop="deliveryDate"
-            style="margin-bottom: 22px"
-          >
-            <el-date-picker
-              v-model="form.deliveryDate"
-              type="date"
-              placeholder="选择日期"
-            >
-            </el-date-picker>
-          </el-form-item> -->
-          <!--          <el-form-item-->
-          <!--            label="采购订单类型"-->
-          <!--            prop="purchaseType"-->
-          <!--            style="margin-bottom: 22px"-->
-          <!--          >-->
-          <!--            <DictSelection-->
-          <!--              dictName="采购订单类型"-->
-          <!--              clearable-->
-          <!--              v-model="form.purchaseType"-->
-          <!--            >-->
-          <!--            </DictSelection>-->
-          <!--          </el-form-item>-->
+
           <el-form-item label="结算方式" prop="settlementMode">
             <DictSelection
               dictName="结算方式"
@@ -127,12 +104,7 @@
           </el-form-item>
           <el-form-item prop="orderFiles" label="附件">
             <fileMain v-model="form.orderFiles"></fileMain>
-            <!--            <fileUpload-->
-            <!--              v-model="form.orderFiles"-->
-            <!--              module="main"-->
-            <!--              :showLib="false"-->
-            <!--              :limit="10"-->
-            <!--            />-->
+           
           </el-form-item>
         </el-col>
       </el-row>
@@ -306,7 +278,7 @@
         <el-tab-pane
           label="带料清单"
           name="2"
-          v-if="['3', '4', '5', '6','7'].includes(form.sourceType)"
+          v-if="orderSourceType.includes(form.sourceType)"
         >
           <inventoryTable
             ref="rawDetailListRef"
@@ -320,7 +292,7 @@
         <el-tab-pane
           label="产出清单"
           name="2"
-          v-if="['3', '4', '5', '6','7'].includes(form.sourceType)"
+          v-if="orderSourceType.includes(form.sourceType)"
         >
           <inventoryTable
             ref="outputDetailListRef"
@@ -420,6 +392,8 @@
     getPurchasePlanByContractIdAPI
   } from '@/api/bpm/components/purchasingManage/purchasePlanManage';
   import fileMain from '@/components/addDoc/index.vue';
+  import { orderSourceType, outsourceSceneList } from '@/enum/dict';
+
   export default {
     mixins: [dictMixins],
     components: {
@@ -481,6 +455,8 @@
       };
 
       return {
+        orderSourceType,
+        outsourceSceneList,
         clearing: false, //是否清除合同
         isFlag: false, //需求类型是否可以修改
         payWayOptions: [],
@@ -937,9 +913,13 @@
             (this.$refs.outputDetailListRef &&
               this.$refs.outputDetailListRef.getTableValue()) ||
             [];
-   
+
           let commitData = Object.assign({}, this.form, {
-            productList: [...this.$refs.inventoryTable.getTableValue(),...rawDetailList,...outputDetailList],
+            productList: [
+              ...this.$refs.inventoryTable.getTableValue(),
+              ...rawDetailList,
+              ...outputDetailList
+            ],
             // purchaseTypeName: this.getDictValue(
             //   '采购订单类型',
             //   this.form.purchaseType

src/views/bpm/handleTask/components/purchaseOrder/detailDialog.vue

@@ -11,7 +11,7 @@
           >
             {{ form.orderNo }}
           </el-form-item>
-          
+
           <el-form-item
             label="项目名称："
             prop="projectName"
@@ -33,22 +33,10 @@
           >
             {{ form.sourceTypeName }}
           </el-form-item>
-       
+
           <el-form-item prop="orderFiles" label="附件：">
             <fileMain v-model="form.orderFiles" type="view"></fileMain>
-            <!--            <div-->
-            <!--              v-if="detailData.orderFiles && detailData.orderFiles?.length"-->
-            <!--            >-->
-            <!--              <el-link-->
-            <!--                v-for="link in detailData.orderFiles"-->
-            <!--                :key="link.id"-->
-            <!--                type="primary"-->
-            <!--                :underline="false"-->
-            <!--                @click="downloadFile(link)"-->
-            <!--              >-->
-            <!--                {{ link.name }}</el-link-->
-            <!--              >-->
-            <!--            </div>-->
+           
           </el-form-item>
 
           <el-form-item prop="remark" label="备注：">
@@ -99,9 +87,7 @@
           >
             {{ form.totalAmount }}元
           </el-form-item>
-          <!-- <el-form-item label="计价方式：" style="margin-bottom: 16px">
-            {{ form.pricingWay == 1 ? '按数量计费' : '按重量计费' }}
-          </el-form-item> -->
+       
         </el-col>
       </el-row>
       <headerTitle title="基本信息"></headerTitle>
@@ -157,17 +143,7 @@
           >
             {{ form.partaAddress }}
           </el-form-item>
-          <!-- <el-form-item
-            label="客户税号"
-            prop="contactAddress"
-            style="margin-bottom: 16px"
-          >
-            <el-input
-              clearable
-              v-model="form.contactAddress"
-              placeholder="请输入"
-            />
-          </el-form-item> -->
+
         </el-col>
 
         <el-col :span="12">
@@ -219,17 +195,7 @@
           >
             {{ form.partbAddress }}
           </el-form-item>
-          <!-- <el-form-item
-            label="售出方税号"
-            prop="contactAddress"
-            style="margin-bottom: 16px"
-          >
-            <el-input
-              clearable
-              v-model="form.contactAddress"
-              placeholder="请输入"
-            />
-          </el-form-item> -->
+      
         </el-col>
       </el-row>
     </el-form>
@@ -257,7 +223,7 @@
       <el-tab-pane
         label="带料清单"
         name="2"
-        v-if="['3', '4', '5', '6','7'].includes(form.sourceType)"
+        v-if="orderSourceType.includes(form.sourceType)"
       >
         <ele-pro-table
           ref="table"
@@ -275,7 +241,7 @@
       <el-tab-pane
         label="产出清单"
         name="3"
-        v-if="['3', '4', '5', '6','7'].includes(form.sourceType)"
+        v-if="orderSourceType.includes(form.sourceType)"
       >
         <ele-pro-table
           ref="table"
@@ -301,6 +267,7 @@
   import dictMixins from '@/mixins/dictMixins';
   import { copyObj } from '@/utils/util';
   import fileMain from '@/components/addDoc/index.vue';
+  import { orderSourceType, outsourceSceneList } from '@/enum/dict';
 
   export default {
     mixins: [dictMixins],
@@ -312,6 +279,8 @@
     },
     data() {
       return {
+        orderSourceType,
+        outsourceSceneList,
         visible: false,
         detailId: '',
         title: '详情',
@@ -494,8 +463,11 @@
             slot: 'pricingWay',
             align: 'center',
             formatter: (row, column) => {
-              return row.pricingWay == 1 ? '按数量计费' : row.pricingWay == 2 ? '按重量计费':'';
-
+              return row.pricingWay == 1
+                ? '按数量计费'
+                : row.pricingWay == 2
+                ? '按重量计费'
+                : '';
             }
           },
           {
@@ -510,11 +482,9 @@
             prop: 'taxRate',
             label: '税率',
             formatter: (_row, _column, cellValue) => {
-              return _row.taxRate
-                ? _row.taxRate+'%'
-                : '';
+              return _row.taxRate ? _row.taxRate + '%' : '';
             },
-            align: 'center',
+            align: 'center'
           },
           {
             width: 160,
@@ -772,7 +742,6 @@
             slot: 'weightUnit',
             align: 'center'
           },
-          
 
           {
             width: 110,
@@ -852,7 +821,7 @@
     created() {
       this.requestDict('产地');
       this.requestDict('生产类型');
-      
+
       this.getDetailData(this.businessId);
     },
     methods: {