Jelajahi Sumber

Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

ccjgmwz 3 tahun lalu
induk
melakukan
46c979ed19

+ 3 - 3
src/views/login/index.vue

@@ -262,7 +262,7 @@
               <el-row>
                 <div class="remember-information">
                   <el-checkbox v-model="rememberMe" class="fl">
-                    <span style="color: #fff">{{
+                    <span>{{
                       $t('login.rememberPwd')
                     }}</span>
                   </el-checkbox>
@@ -337,9 +337,9 @@
             </el-form>
             <div class="make-easier">
               <p>{{ $t('common.makeEasier') }}</p>
-              <BaseLink @click="goBackstage" :underline="false" type="primary">
+              <!-- <BaseLink @click="goBackstage" :underline="false" type="primary">
                 &nbsp;&nbsp;{{ $t('common.goBackstage') }}
-              </BaseLink>
+              </BaseLink> -->
             </div>
           </div>
         </div>

+ 195 - 1
src/views/taskManagement/inOutWarehouseTaskEdit.vue

@@ -31,7 +31,7 @@
         </span>
       </div>
       <div class="nav2"></div>
-      <div v-if="dataList.taskTypeKey != 2" class="center1">
+      <div v-if="dataList.taskTypeKey != 2&&dataList.taskTypeKey != 4" class="center1">
         <!--出库=-->
         <div class="small-title">
           <img
@@ -419,6 +419,200 @@
           </el-form-item>
         </el-form>
       </div>
+      <div v-if="dataList.taskTypeKey == 4" class="center1">
+        <!--出库=-->
+        <div class="small-title">
+          <img
+            style="position: relative; top: 40px; left: -22px;"
+            width="19"
+            height="19"
+            src="../../../public/img/cangku.png"
+            alt
+          />
+          <h3>出库任务({{ dataList.inOutTaskNo }} )</h3>
+        </div>
+        <el-form ref="dataList" :model="dataList" label-width="140px">
+          <!-- 仓库名 -->
+          <el-form-item label="仓库名">
+            <!-- <el-select
+              disabled
+              v-model="dataList.warehouseName"
+              placeholder="请选择仓库名"
+              class="typeselect"
+            >-->
+            <el-option
+              v-for="item in warehouseNameList"
+              :key="item.constKey"
+              :label="item.warehouseName"
+              :value="item.warehouseName"
+            />
+            {{dataList.warehouseName}}
+            <!-- </el-select> -->
+          </el-form-item>
+          <!-- 出库类型 -->
+          <el-form-item label="出库类型">
+            <!-- <el-select
+              disabled
+              v-model="dataList.inOutType"
+              placeholder="请选择出库类型"
+              class="typeselect"
+            >-->
+            <el-option
+              v-for="item in storageType"
+              :key="item.constKey"
+              v-if="
+                  (dataList.taskTypeKey == 1 &&
+                    item.constValue != '移库出库') ||
+                  (dataList.taskTypeKey == 3 &&
+                    item.constValue == '移库出库') ||
+                  (dataList.taskTypeKey == 4 && item.constValue == '销售出库')
+                "
+              :label="item.constValue"
+              :value="item.constValue"
+            />
+            {{dataList.inOutType}}
+            <!-- </el-select> -->
+          </el-form-item>
+          <!-- 合同编号 -->
+          <el-form-item label="合同编号">
+            <!-- <el-select
+              disabled
+              v-model="dataList.contractNo"
+              placeholder="请输入合同编号"
+              class="typeselect"
+            >-->
+            <el-option
+              v-for="item in contractNoList"
+              :key="item.constKey"
+              :label="item.contractNo"
+              :value="item.contractNo"
+            ></el-option>
+            {{dataList.contractNo}}
+            <!-- </el-select> -->
+          </el-form-item>
+          <!-- 货名 -->
+          <el-form-item label="货名" class="huom">
+            <!-- <el-select
+              disabled
+              v-model="dataList.goodsName"
+              placeholder="货名"
+              class="huom"
+            >-->
+            <el-option
+              v-for="item in goodnameList"
+              :key="item.constKey"
+              :label="item.constValue"
+              :value="item.constValue"
+            ></el-option>
+            {{dataList.goodsName}}
+            <!-- </el-select> -->
+          </el-form-item>
+          <!--重量(吨)-->
+          <el-form-item label="重量(吨)" span="1" style=" margin-left: 350px; margin-top: -40px">
+            <!-- <el-input
+              disabled
+              v-model="dataList.weight"
+              placeholder="请输入重量"
+              maxlength="120"
+               class="huom"
+            />-->
+            {{dataList.weight}}
+          </el-form-item>
+          <!-- 品级 -->
+          <el-form-item label="品级">
+            <!-- <el-select
+              v-model="dataList.grade"
+              placeholder=""
+              class="typeselect"
+              disabled
+            >-->
+            <el-option
+              v-for="item in gradeList"
+              :key="item.constKey"
+              :label="item.constValue"
+              :value="item.constValue"
+            />
+            {{dataList.grade}}
+            <!-- </el-select> -->
+          </el-form-item>
+          <!--容重(克/升)>=-->
+          <el-form-item label="容重(克/升)>=">
+            <!-- <el-input
+              disabled
+              v-model="dataList.bulkDensity"
+              placeholder="请输入容重"
+              maxlength="120"
+              size="small"
+              class="huom"
+            />-->
+            {{dataList.bulkDensity}}
+          </el-form-item>
+          <!--水分(%)<=-->
+          <el-form-item label="水分(%)<=" span="1" style=" margin-left: 350px; margin-top: -40px">
+            <!-- <el-input
+              disabled
+              v-model="dataList.waterContent"
+              placeholder="请输入水分占比"
+              maxlength="120"
+              size="small"
+              class="huom"
+            />-->
+            {{dataList.waterContent}}
+          </el-form-item>
+          <!--单价(元/吨)-->
+          <el-form-item label="单价(元/吨)" span="1" style=" margin-left: 650px; margin-top: -40px">
+            <!-- <el-input
+              disabled
+              v-model="dataList.unitPrice"
+              placeholder="请输入单价"
+              maxlength="120"
+              size="small"
+              class="huom"
+            />-->
+            {{dataList.unitPrice}}
+          </el-form-item>
+          <!--预计出库日期-->
+          <el-form-item label="预计出库日期" span="1" prop="predictDate" class="deliverydate">
+            <!-- <el-date-picker
+              disabled
+              v-model="dataList.predictDate"
+              type="date"
+              placeholder="请选择预计出库日期"
+              value-format="yyyy-MM-dd"
+            />-->
+            {{dataList.predictDate}}
+          </el-form-item>
+          <!--经办人-->
+          <el-form-item label="出库经办人">
+            <!-- <el-select
+              disabled
+              v-model="dataList.agent"
+              placeholder="请选择经办人"
+              filterable
+              :filter-method="dataFilter"
+            >-->
+            {{dataList.agent}}
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.staffName"
+              :value="item.staffName"
+            />
+            <!-- </el-select> -->
+          </el-form-item>
+          <!--业务描述=-->
+          <el-form-item label="业务描述">
+            <!-- <el-input
+              disabled
+              v-model="dataList.businessDescribe"
+              placeholder="请输入业务描述,不超过150字"
+              maxlength="150"
+              size="small"
+            />-->
+            {{dataList.businessDescribe}}
+          </el-form-item>
+        </el-form>
+      </div>
     </div>
     <!-- 提交 -->
     <div style="text-align: right; padding: 10px" class="center">