前端

src/App.vue

@@ -126,4 +126,8 @@ input[type='number'] {
 .el-table th>.cell{
   line-height: 20px!important;
 }
+.el-submenu__title{
+  display: flex;
+  align-items: center;
+}
 </style>

src/views/contractManagement/acquisitionContractAdd.vue

@@ -52,8 +52,8 @@
           </el-select>
         </ws-form-item>
         <ws-form-item label="交货方式" span="1" prop="seller" class="readonly">
-          <el-radio v-model="deptBudgetList.deliverType" label="1">我方自提</el-radio>
           <el-radio v-model="deptBudgetList.deliverType" label="2">对方送货</el-radio>
+          <el-radio v-model="deptBudgetList.deliverType" label="1">我方自提</el-radio>
           <!-- <el-radio v-model="deptBudgetList.deliverType" v-if="deptBudgetList.priceType == '随行就市'" disabled label="1">
               我方自提</el-radio>
             <el-radio v-model="deptBudgetList.deliverType" v-else label="1">我方自提</el-radio>
@@ -361,7 +361,7 @@ import { isUndefined } from 'xe-utils/methods'
         ChapterTwoList: [],
         agreementType: '',
         deptBudgetList: {
-          deliverType: '1',
+          deliverType: '2',
           sourceGoods:'',
           placeDelivery:'',
           addressUrl: '',

src/views/contractManagement/component/routers/route.js

@@ -12,6 +12,7 @@ const contractManagementRouter = {
     icon: '-hetongguanli'
   },
   children: [
+    
     // 现货采购合同
     {
       path: 'buyContract',
@@ -94,72 +95,7 @@ const contractManagementRouter = {
       },
       hidden: true
     },
-    // 收购合同
-    {
-      path: 'acquisitionContract',
-      component: () =>
-        import(/* webpackChunkName: "sparepartList" */ '@/views/contractManagement/acquisitionContract'),
-      name: 'acquisitionContract',
-      meta: {
-        title: 'acquisitionContract',
-        shortcutEntrance: 'contractManagement',
-        module: 'contractManagement.buyContract',
-        permissicon: [],
-        keepAlive: true,
-        _title:'收购合同'
-      }
-    },
-    //收购合同查看
-    {
-      path: 'acquisitionContractExamine',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/contractManagement/acquisitionContractExamine'),
-      name: 'acquisitionContractExamine',
-      meta: {
-        title: 'acquisitionContractExamine',
-        shortcutEntrance: 'contractManagement',
-        module: 'contractManagement.buyContract.buyContractInfo.view',
-        permissicon: [],
-        keepAlive: true,
-        _title:'收购合同查看'
-        // module: 'procurement.sparepart.applDetail'
-      },
-      hidden: true
-    },
-    //收购合同编辑
-    {
-      path: 'acquisitionContractEdit',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/contractManagement/acquisitionContractEdit'),
-      name: 'acquisitionContractEdit',
-      meta: {
-        title: 'acquisitionContractEdit',
-        shortcutEntrance: 'contractManagement',
-        module: 'contractManagement.buyContract.buyContractInfo.edit',
-        permissicon: [],
-        keepAlive: true,
-        _title:'收购合同编辑'
-        // module: 'procurement.sparepart.applDetail'
-      },
-      hidden: true
-    },
-    //收购合同添加
-    {
-      path: 'acquisitionContractAdd',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/contractManagement/acquisitionContractAdd'),
-      name: 'acquisitionContractAdd',
-      meta: {
-        title: 'acquisitionContractAdd',
-        shortcutEntrance: 'contractManagement',
-        module: 'contractManagement.buyContract.buyContractInfo.add',
-        permissicon: [],
-        keepAlive: true,
-        _title:'收购合同添加'
-        // module: 'procurement.sparepart.applDetail'
-      },
-      hidden: true
-    },
+    
 
     // 期货采购合同
     // {
@@ -311,7 +247,72 @@ const contractManagementRouter = {
       },
       hidden: true
     },
-
+    // 收购合同
+    {
+      path: 'acquisitionContract',
+      component: () =>
+        import(/* webpackChunkName: "sparepartList" */ '@/views/contractManagement/acquisitionContract'),
+      name: 'acquisitionContract',
+      meta: {
+        title: 'acquisitionContract',
+        shortcutEntrance: 'contractManagement',
+        module: 'contractManagement.buyContract',
+        permissicon: [],
+        keepAlive: true,
+        _title:'收购合同'
+      }
+    },
+    //收购合同查看
+    {
+      path: 'acquisitionContractExamine',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/contractManagement/acquisitionContractExamine'),
+      name: 'acquisitionContractExamine',
+      meta: {
+        title: 'acquisitionContractExamine',
+        shortcutEntrance: 'contractManagement',
+        module: 'contractManagement.buyContract.buyContractInfo.view',
+        permissicon: [],
+        keepAlive: true,
+        _title:'收购合同查看'
+        // module: 'procurement.sparepart.applDetail'
+      },
+      hidden: true
+    },
+    //收购合同编辑
+    {
+      path: 'acquisitionContractEdit',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/contractManagement/acquisitionContractEdit'),
+      name: 'acquisitionContractEdit',
+      meta: {
+        title: 'acquisitionContractEdit',
+        shortcutEntrance: 'contractManagement',
+        module: 'contractManagement.buyContract.buyContractInfo.edit',
+        permissicon: [],
+        keepAlive: true,
+        _title:'收购合同编辑'
+        // module: 'procurement.sparepart.applDetail'
+      },
+      hidden: true
+    },
+    //收购合同添加
+    {
+      path: 'acquisitionContractAdd',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/contractManagement/acquisitionContractAdd'),
+      name: 'acquisitionContractAdd',
+      meta: {
+        title: 'acquisitionContractAdd',
+        shortcutEntrance: 'contractManagement',
+        module: 'contractManagement.buyContract.buyContractInfo.add',
+        permissicon: [],
+        keepAlive: true,
+        _title:'收购合同添加'
+        // module: 'procurement.sparepart.applDetail'
+      },
+      hidden: true
+    },
     //期货销售合同
     // {
     //   path: 'futuresSalesContract',

src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -25,8 +25,8 @@
         <el-col :span="8">
           <div style='text-align:center;'>
             <span>&nbsp;</span>
-            <el-button @click='add' type="primary" v-if="qyJurisdiction&&statusTypetext == '初检' || serviceManagementType == 1">新增</el-button>
-            <el-button @click='deletelist' type="danger" v-if="qyJurisdiction&&statusTypetext == '初检' || serviceManagementType == 1">删除
+            <el-button @click='add' type="primary" v-if="qyJurisdiction&&statusTypetext == '初检' || serviceManagementType == 1&&statusTypetext == '初检'">新增</el-button>
+            <el-button @click='deletelist' type="danger" v-if="qyJurisdiction&&statusTypetext == '初检' || serviceManagementType == 1&&statusTypetext == '初检'">删除
             </el-button>
           </div>
         </el-col>
@@ -54,29 +54,29 @@
                 </el-checkbox>
               </div>
               <ws-info-table>
-                <ws-form-item v-if='serviceManagementType == 1' label="任务编号" span="1" prop="inOutTaskNo">
+                <!-- <ws-form-item v-if='serviceManagementType == 1' label="任务编号" span="1" prop="inOutTaskNo">
                   <el-select :disabled='recheck' filterable clearable v-model="deptBudgetList.inOutTaskNo"
                     placeholder="请选择任务编号" class="typeselect" @change="contractNoChange">
                     <el-option v-for="item in taskNolist" :key="'renwu' + item.inOutTaskNo" :label="item.inOutTaskNo"
                       :value="item.inOutTaskNo" />
                   </el-select>
-                </ws-form-item>
-                <!-- <ws-form-item v-if='serviceManagementType == 3 && qyJurisdiction&&statusTypetext == "初检"||serviceManagementType == 3 && statusTypetext != "初检"||serviceManagementType == 1' label="任务编号" span="1" prop="inOutTaskNo">
+                </ws-form-item> -->
+                <ws-form-item v-if='serviceManagementType == 3 && qyJurisdiction&&statusTypetext == "初检"||serviceManagementType == 3 && statusTypetext != "初检"||serviceManagementType == 1' label="任务编号" span="1" prop="inOutTaskNo">
                   <el-select :disabled='recheck' filterable clearable v-model="deptBudgetList.inOutTaskNo"
                     placeholder="请选择任务编号" class="typeselect" @change="contractNoChange">
                     <el-option v-for="item in taskNolist" :key="'renwu' + item.inOutTaskNo" :label="item.inOutTaskNo"
                       :value="item.inOutTaskNo" />
                   </el-select>
-                </ws-form-item> -->
+                </ws-form-item>
                 <ws-form-item v-if='serviceManagementType==3&&deptBudgetList.id' label="业务编号" span="1" prop="qualityNo">
                   <ws-input v-model="deptBudgetList.qualityNo" placeholder="自动获取，不可编辑" maxlength="100" disabled
                     size="small" />
                 </ws-form-item>
-                <!-- <ws-form-item v-if='serviceManagementType == 3 && qyJurisdiction&&statusTypetext == "初检"||serviceManagementType == 3 && statusTypetext != "初检"' label="合同编号"
+                <ws-form-item v-if='serviceManagementType == 3 && qyJurisdiction&&statusTypetext == "初检"||serviceManagementType == 3 && statusTypetext != "初检"' label="合同编号"
                   span="1" prop="contractNo">
                   <ws-input v-model="deptBudgetList.contractNo" placeholder="自动获取，不可编辑" maxlength="100" disabled
                     size="small" />
-                </ws-form-item> -->
+                </ws-form-item>
                 <ws-form-item v-if='serviceManagementType == 3 && zjJurisdiction&&statusTypetext == "初检"||serviceManagementType == 3 && statusTypetext != "初检"' label="购粮性质" span="1"
                   prop="natureOfGrainPurchase">
                   <ws-input v-model="deptBudgetList.natureOfGrainPurchase" placeholder="请输入购粮性质" maxlength="10"
@@ -1258,7 +1258,8 @@ export default {
             mildewGrain: response.mildewGrain,
             reMildewGrain: response.reMildewGrain,
           }
-          this.deptBudgetList.carNo = response.carNumber
+          this.$set(this.deptBudgetList,'carNo',response.carNumber)
+          this.outType=this.deptBudgetList.outType
           for (let i = 0; i < this.taskNolist.length; i++) {
             if (this.taskNolist[i].inOutTaskNo == this.deptBudgetList.inOutTaskNo) {
               console.log(this.taskNolist[i])
@@ -2801,6 +2802,7 @@ export default {
                           })
                           this.getList()
                           this.selectWarehouse()
+                          this.add()
                       })
                     }