领料

zkqy-ui/.env.development

@@ -20,7 +20,7 @@ VUE_CLI_BABEL_TRANSPILE_MODULES = true
 VUE_APP_BASE_API1 = 'http://192.168.110.129:8066/'
 
 # ws地址
-VUE_APP_BASE_WS_API = '//192.168.110.15:8721'
+VUE_APP_BASE_WS_API = '//localhost:8721'
 
 #数据引擎模块IP
 #VUE_APP_BASE_API2 = 'http://192.168.110.59:8099/'

zkqy-ui/.env.production

@@ -16,7 +16,7 @@ VUE_APP_BASE_API1 = 'http://192.168.0.17:8066/'
 VUE_APP_BASE_IMG_API = 'http://192.168.0.17:1024/dev-api'
 
 # ws地址
-VUE_APP_BASE_WS_API = '//127.0.0.1:8721'
+VUE_APP_BASE_WS_API = '//localhsot:8721'
 
 
 #数据引擎模块IP

zkqy-ui/src/views/orderMange/requisitionOrders/index.vue

@@ -169,25 +169,28 @@
     <!-- 添加或修改领料单对话框 -->
     <el-dialog :title="requistionOrdersType?'退料单':'领料单'" :visible.sync="open" width="800px" append-to-body :before-close="cancel">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-row :gutter="20">
+        <el-row :gutter="24">
           <el-col :span="8">
             <el-form-item label="单据类型" prop="requistionOrdersType">
               <el-select v-model="form.requistionOrdersType" filterable placeholder="请选择任务"
-                         :disabled="requistionState" @change="handleRequistionState(form.requistionOrdersType)">
+                         :disabled="isUpdate?true:requistionState?true:false" @change="handleRequistionState(form.requistionOrdersType)">
                 <el-option key="0" label="领料" :value=0></el-option>
                 <el-option key="1" label="退料" :value=1></el-option>
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="16">
             <el-form-item :label="requistionOrdersType?'退料任务':'领料任务'" prop="taskCode">
-              <el-select v-model="form.taskCode" filterable placeholder="请选择任务" :disabled="requistionState"
-                         @change="handleRequistionState(form.requistionOrdersType)">
-                <el-option v-for="item in taskList" :key="item.saleProductsId" :label="item.saleProductsTaskName"
+              <el-select v-model="form.taskCode" filterable placeholder="请选择任务" :disabled="isUpdate?true:requistionState?true:false"
+                         @change="handleRequistionState(form.requistionOrdersType)" style="width:300px">
+                <el-option v-for="item in taskList" :key="item.saleProductsId" :label="item.saleProductsSaleOrderNo+'-'+item.saleProductsTaskName+'-'+item.saleProductsProductNumber"
                            :value="item.saleProductsId"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
+
+        </el-row>
+        <el-row :span="24">
           <el-col :span="8">
             <el-form-item :label="requistionOrdersType?'退料日期':'领料日期'" prop="requisitionDate">
               <el-date-picker style="width: 100%" v-model="form.requisitionDate" type="date"
@@ -300,6 +303,8 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      //是否是修改弹窗
+      isUpdate:false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -435,6 +440,7 @@ export default {
       // 获取物料信息
       this.getMaterielList();
       this.reset();
+      this.isUpdate=false;
       this.open = true;
       this.title = "添加领料单";
       // 默认领料时间为当前
@@ -449,6 +455,9 @@ export default {
       const id = row.id || this.ids
       // 获取领料任务
       this.getTaskList();
+      // 获取物料信息
+      this.getMaterielList();
+      this.isUpdate=true;
       getRequisitionOrders(id).then(response => {
         this.form = response.data;
         // this.taskList.find(item => {