Merge branch 'master' of http://git.zthymaoyi.com:3000/gdc/yiliangyiyun-pc

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -1433,8 +1433,8 @@
 					var random = this.getdate() + this.MathRand()
 					this.inOutTaskNo = 'YKC' + random
 					this.inOutTaskNo1 = 'YKR' + random
-          this.dataList.moveTaskNo = 'YKRW' + random
-		   this.dataList1.moveTaskNo = 'YKRW' + random
+        //   this.dataList.moveTaskNo = 'YKRW' + random
+		//    this.dataList1.moveTaskNo = 'YKRW' + random
 				} else if (this.dataList.taskTypeKey == 4) {
 					var random = this.getdate() + this.MathRand()
 					this.inOutTaskNo = 'TCC' + random

src/views/taskManagement/tranManagementWarehouseInOutTaskEdit.vue

@@ -112,19 +112,12 @@
             </el-select>
           </el-form-item>
           <el-form-item v-if="dataList.taskTypeKey == 3" label="移库任务编号">
-            <el-select
-              @change="selectTaskNo"
+             <el-input
+              disabled
               v-model="dataList.moveTaskNo"
               placeholder="请输入移库任务编号"
-              class="typeselect"
-            >
-              <el-option
-                v-for="item in contractNoList"
-                :key="item.constKey"
-                :label="item.contractNo"
-                :value="item.contractNo"
-              ></el-option>
-            </el-select>
+              size="small" 
+            />
           </el-form-item>
           <!-- 货名 -->
           <el-form-item label="货名" class="huom">
@@ -315,19 +308,12 @@
             </el-select>
           </el-form-item>
           <el-form-item v-if="dataList1.taskTypeKey == 3" label="移库任务编号">
-            <el-select
+          <el-input
               disabled
-              v-model="dataList1.moveTaskNo"
+              v-model="dataList.moveTaskNo"
               placeholder="请输入移库任务编号"
-              class="typeselect"
-            >
-              <el-option
-                v-for="item in contractNoList"
-                :key="item.constKey"
-                :label="item.contractNo"
-                :value="item.contractNo"
-              ></el-option>
-            </el-select>
+              size="small" 
+            />
           </el-form-item>
           <!-- 货名 -->
           <el-form-item label="货名" class="huom">
@@ -522,19 +508,12 @@
             </el-select>
           </el-form-item>
           <el-form-item v-if="dataList.taskTypeKey == 3" label="移库任务编号">
-            <el-select
-              @change="selectTaskNo"
+            <el-input
+              disabled
               v-model="dataList.moveTaskNo"
               placeholder="请输入移库任务编号"
-              class="typeselect"
-            >
-              <el-option
-                v-for="item in contractNoList"
-                :key="item.constKey"
-                :label="item.contractNo"
-                :value="item.contractNo"
-              ></el-option>
-            </el-select>
+              size="small" 
+            />
           </el-form-item>
           <!-- 货名 -->
           <el-form-item label="货名" class="huom">