相同代码

src/views/login.vue

@@ -77,8 +77,9 @@ export default {
         ],
         password: [
           { required: true, trigger: "blur", message: "密码不能为空" }
-        ],
-        code: [{ required: true, trigger: "change", message: "验证码不能为空" }]
+        ]
+        /* ,
+        code: [{ required: true, trigger: "change", message: "验证码不能为空" }] */
       },
       loading: false,
       redirect: undefined

src/views/warehouseBusiness/inStock/index.vue

@@ -200,7 +200,18 @@
       <el-table-column label="制单人" align="center" prop="createBy"/>
       <el-table-column label="客户名称" align="center" prop="fcorpid"/>
       <el-table-column label="贸易方式" align="center" prop="ftrademodeid"/>
+      <!-- <el-table-column label="货转客户名称" align="center" prop="fTocorpid" /> -->
       <el-table-column label="入库毛重" align="center" prop="fgrossweight"/>
+      <!-- <el-table-column
+        label="入库日期"
+        align="center"
+        prop="fcreatetime"
+        width="180"
+      >
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.fcreatetime, "{y}-{m}-{d}") }}</span>
+        </template>
+      </el-table-column> -->
       <el-table-column label="入库件数" align="center" prop="fQty"/>
       <el-table-column label="入库毛重" align="center" prop="fGrossweight"/>
       <el-table-column
@@ -221,6 +232,103 @@
         :formatter="fIfpledgeFormat"
       />
       <el-table-column label="质押银行" align="center" prop="fBankcorpid"/>
+      <el-table-column label="业务编号" align="center" prop="fBillno"/>
+      <el-table-column label="报关号" align="center" prop="fCustomno"/>
+      <el-table-column
+        label="原始业务编号,入库时和f_billno 相同，出库 取入库的f_originalbillno"
+        align="center"
+        prop="fOriginalbillno"
+      />
+      <el-table-column label="制单部门" align="center" prop="fDeptid"/>
+      <el-table-column label="业务所属部门" align="center" prop="fBsdeptid"/>
+      <el-table-column label="联系人" align="center" prop="fContacts"/>
+      <el-table-column label="电话" align="center" prop="fTel"/>
+      <el-table-column
+        label="货权方，t_corps 中的no或 name，模糊查找选择后，存储id，显示name"
+        align="center"
+        prop="fCorpid"
+      />
+      <el-table-column
+        label="货转客户名称，t_corps 中的no或 name，模糊查找选择后，存储id，显示name，自有在货权转移是该字段有效"
+        align="center"
+        prop="fTocorpid"
+      />
+      <el-table-column
+        label="结算方式，默认提取corps中stltypeid	也可以从表t_stltypes中下拉选择，存储id，显示name"
+        align="center"
+        prop="fStltypeid"
+      />
+      <el-table-column
+        label="客户存货编号,格式编号客户编号+YYYY +NNNN，
+编号不能断号，要连续、如果删除该编号，下次新建单据，优先使用，每年从001开始"
+        align="center"
+        prop="fBscorpno"
+      />
+      <el-table-column label="仓库" align="center" prop="fWarehouseid"/>
+      <el-table-column label="仓管人" align="center" prop="fStorekeeper"/>
+      <el-table-column
+        label="计划件数,由明细表自动合计生成"
+        align="center"
+        prop="fPlanqty"
+      />
+      <el-table-column
+        label="计划毛重,由明细表自动合计生成"
+        align="center"
+        prop="fPlangrossweight"
+      />
+      <el-table-column
+        label="计划净重,由明细表自动合计生成"
+        align="center"
+        prop="fPlannetweight"
+      />
+      <el-table-column
+        label="计划尺码,由明细表自动合计生成"
+        align="center"
+        prop="fPlanvolumn"
+      />
+      <el-table-column
+        label="尺码，由明细表自动合计生成"
+        align="center"
+        prop="fVolumn"
+      />
+      <el-table-column
+        label="贸易方式(数据字典),对应t_trademodels "
+        align="center"
+        prop="fTrademodeid"
+        :formatter="fTrademodeidFormat"
+      />
+      <el-table-column label="经营单位(客户列表)" align="center" prop="fSbu"/>
+      <el-table-column
+        label="计费单位(数据字典),下拉选择毛重或净重"
+        align="center"
+        prop="fFeetunit"
+        :formatter="fFeetunitFormat"
+      />
+      <el-table-column label="提单号" align="center" prop="fMblno"/>
+      <el-table-column
+        label="提单号"
+        align="center"
+        prop="fVslvoy"
+      />
+      <el-table-column label="到港日期" align="center" prop="fEta" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.fEta, "{y}-{m}-{d}") }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="报关单号" align="center" prop="fCustomno"/>
+      <el-table-column
+        label="是否过磅(数据字典)默认 F ,过磅T 否者F 下拉选择"
+        align="center"
+        prop="fIfweigh"
+        :formatter="fIfweighFormat"
+      />
+      <el-table-column
+        label="单据类型(数据字典)SJRK"
+        align="center"
+        prop="fBilltype"
+        :formatter="fBilltypeFormat"
+      />
+      <el-table-column label="备注" align="center" prop="remark"/>
       <el-table-column
         label="操作"
         align="center"
@@ -340,62 +448,11 @@
               <el-input v-model="form.fTel" placeholder="请输入电话"/>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item label="提单号" prop="fmblno">
-              <el-input v-model="form.fMblno" placeholder="请输入提单号"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="入库日期" prop="fbsdate">
-              <el-date-picker
-                v-model="form.fBsdate"
-                type="date"
-                value-format="timestamp"
-                placeholder="入库日期"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
         </el-row>
         <el-row>
           <el-col :span="8">
-            <el-form-item label="仓管人" prop="fstorekeeper">
-              <el-input v-model="form.fStorekeeper" placeholder="请输入仓管人"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="制单人" prop="createBy">
-              <el-input disabled v-model="form.createBy" placeholder="制单人"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="制单部门" prop="fDeptid">
-              <el-select
-                v-model="form.fDeptid"
-                filterable
-                disabled
-                remote>
-                <el-option
-                  v-for="dict in deptOptions"
-                  :key="dict.deptId"
-                  :label="dict.deptName"
-                  :value="dict.deptId"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="8">
-            <el-form-item disabled label="制单日期" prop="fbilldate">
-              <el-date-picker
-                v-model="form.createTime"
-                type="date"
-                disabled
-                value-format="timestamp"
-                placeholder="制单日期"
-              >
-              </el-date-picker>
+            <el-form-item label="提单号" prop="fmblno">
+              <el-input v-model="form.fMblno" placeholder="请输入提单号"/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -407,6 +464,7 @@
             <el-form-item label="到港日期" prop="feta">
               <el-date-picker
                 v-model="form.fEta"
+                style="width: 375px"
                 type="date"
                 value-format="timestamp"
                 placeholder="到港日期"
@@ -587,8 +645,20 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="银行名称" prop="fbankcorpid">
-              <el-input v-model="form.fBankcorpid" laceholder="银行名称"/>
+            <el-form-item label="计费单位" prop="ffeetunit">
+              <el-select
+                v-model="form.fFeetunit"
+                placeholder="请选择计费单位"
+                clearable
+                size="small"
+              >
+                <el-option
+                  v-for="dict in fFeetunitOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+                />
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
@@ -924,14 +994,6 @@
           align="center"
           label="上传人"
         >
-        <template slot-scope="scope">
-            <el-input
-              v-model="scope.row.opUserName"
-              :disabled="browseStatus"
-              placeholder="上传人"
-              show-word-limit
-            />
-          </template>
         </el-table-column>
         <el-table-column
           prop="opDate"
@@ -951,7 +1013,6 @@
           </template>
         </el-table-column>
         <el-table-column
-          prop="attachId"
           header-align="center"
           align="center"
           width="250PX"
@@ -1584,14 +1645,6 @@
           remark: null
         });
       },
-      addRelevt(){
-        this.relevantAttachments.push({
-          attachName:null,
-          opUserName:null,
-          opDate:null,
-          attachId:null,
-        })
-      },
       // 收款信息
       addCollection() {
         var obj = {};
@@ -1726,8 +1779,6 @@
         this.single = selection.length !== 1;
         this.multiple = !selection.length;
       },
-      checkType() {
-      },
       /** 新增按钮操作 */
       handleAdd() {
         this.reset();