Browse Source

打印单库管字段修改

lichao 3 năm trước cách đây
mục cha
commit
aaa84f4588

+ 1 - 1
src/views/Warehousing/costModify/AddOrUpdate.vue

@@ -258,7 +258,7 @@
                 >
                 >
                     <el-option
                     <el-option
                       v-for="(dict, index) in fNameOptions"
                       v-for="(dict, index) in fNameOptions"
-                      :key="index.fId"
+                      :key="dict.fId"
                       :label="dict.fName"
                       :label="dict.fName"
                       :value="dict.fId"
                       :value="dict.fId"
                     ></el-option>
                     ></el-option>

+ 28 - 14
src/views/Warehousing/outStock/AddOrUpdate.vue

@@ -181,6 +181,7 @@
                 :disabled="browseStatus || form.warehouseStatus > 3"
                 :disabled="browseStatus || form.warehouseStatus > 3"
                 style="width: 80%"
                 style="width: 80%"
                 placeholder="请输入模糊查找"
                 placeholder="请输入模糊查找"
+                @change="fStorekeeperChange"
             >
             >
               <el-option
               <el-option
                   v-for="(item, index) in userOptions"
                   v-for="(item, index) in userOptions"
@@ -3515,11 +3516,11 @@
               <td>{{ item.fMblno }}</td>
               <td>{{ item.fMblno }}</td>
               <td>{{ item.fCntrno }}</td>
               <td>{{ item.fCntrno }}</td>
               <td>{{ item.fQty }}</td>
               <td>{{ item.fQty }}</td>
-              <td v-if="item.fGrossweight && radio == 1">
-                {{ (item.fGrossweight / 1000).toFixed(4) }}
+              <td v-if="item.fNetweight && radio == 1">
+                {{ (item.fNetweight / 1000).toFixed(4) }}
               </td>
               </td>
-              <td v-else-if="item.fGrossweight && radio == 2">
-                {{ item.fGrossweight }}
+              <td v-else-if="item.fNetweight && radio == 2">
+                {{ item.fNetweight }}
               </td>
               </td>
               <td v-else></td>
               <td v-else></td>
               <td>{{ form.fCartype | fCartypeFormat(fCartypeOptions) }}</td>
               <td>{{ form.fCartype | fCartypeFormat(fCartypeOptions) }}</td>
@@ -3625,11 +3626,11 @@
               <td>{{ item.fBusinessType | fStorageTypeFormat(fStorageTypeOptions) }}</td>
               <td>{{ item.fBusinessType | fStorageTypeFormat(fStorageTypeOptions) }}</td>
               <td>{{ item.fMarks }}</td>
               <td>{{ item.fMarks }}</td>
               <td>{{ item.fQty }}</td>
               <td>{{ item.fQty }}</td>
-              <td v-if="item.fGrossweight && radio == 1">
-                {{ (item.fGrossweight / 1000).toFixed(4) }}
+              <td v-if="item.fNetweight && radio == 1">
+                {{ (item.fNetweight / 1000).toFixed(4) }}
               </td>
               </td>
-              <td v-else-if="item.fGrossweight && radio == 2">
-                {{ item.fGrossweight }}
+              <td v-else-if="item.fNetweight && radio == 2">
+                {{ item.fNetweight }}
               </td>
               </td>
               <td v-else></td>
               <td v-else></td>
               <td>{{ form.fCartype | fCartypeFormat(fCartypeOptions) }}</td>
               <td>{{ form.fCartype | fCartypeFormat(fCartypeOptions) }}</td>
@@ -3779,7 +3780,7 @@
             style="display: flex; justify-content: space-between; font-size: 12px"
             style="display: flex; justify-content: space-between; font-size: 12px"
         >
         >
           <div>操作:{{ form.createBy }}</div>
           <div>操作:{{ form.createBy }}</div>
-          <div>库管:{{ form.fContacts }}</div>
+          <div>库管:{{ form.fStorekeeper | fStorekeeperFormat(userOptions) }}</div>
           <div style="width: 100px">叉车:</div>
           <div style="width: 100px">叉车:</div>
         </div>
         </div>
       </div>
       </div>
@@ -3871,7 +3872,7 @@
           </table>
           </table>
         </div>
         </div>
         <div style="display: flex; justify-content: space-between; font-size: 12px">
         <div style="display: flex; justify-content: space-between; font-size: 12px">
-          <div>库管:{{ form.fContacts }}</div>
+          <div>库管:{{ form.fStorekeeper | fStorekeeperFormat(userOptions) }}</div>
           <div style="width: 100px">叉车:</div>
           <div style="width: 100px">叉车:</div>
         </div>
         </div>
       </div>
       </div>
@@ -3974,7 +3975,7 @@
         <div
         <div
             style="display: flex; justify-content: space-between; font-size: 12px"
             style="display: flex; justify-content: space-between; font-size: 12px"
         >
         >
-          <div>库管:{{ form.fContacts }}</div>
+          <div>库管:{{ form.fStorekeeper | fStorekeeperFormat(userOptions) }}</div>
           <div style="width: 130px;margin-right: 20px">叉车:</div>
           <div style="width: 130px;margin-right: 20px">叉车:</div>
         </div>
         </div>
         <div
         <div
@@ -4093,7 +4094,7 @@
         <div
         <div
             style="display: flex; justify-content: space-between; font-size: 12px"
             style="display: flex; justify-content: space-between; font-size: 12px"
         >
         >
-          <div>库管:{{ form.fContacts }}</div>
+          <div>库管:{{ form.fStorekeeper | fStorekeeperFormat(userOptions) }}</div>
         </div>
         </div>
       </div>
       </div>
       <span slot="footer" class="dialog-footer">
       <span slot="footer" class="dialog-footer">
@@ -4210,7 +4211,7 @@
         <div
         <div
             style="display: flex; justify-content: space-between; font-size: 12px;margin-bottom: 20px"
             style="display: flex; justify-content: space-between; font-size: 12px;margin-bottom: 20px"
         >
         >
-          <div>库管:{{ form.fContacts }}</div>
+          <div>库管:{{ form.fStorekeeper | fStorekeeperFormat(userOptions) }}</div>
           <div style="width: 130px;margin-right: 20px">叉车:</div>
           <div style="width: 130px;margin-right: 20px">叉车:</div>
         </div>
         </div>
         <div
         <div
@@ -5898,6 +5899,15 @@ export default {
       });
       });
       return fCartype;
       return fCartype;
     },
     },
+    fStorekeeperFormat(row, userOptions) {
+      let nickName;
+      userOptions.map(e => {
+        if (row == e.userName) {
+          nickName = e.nickName;
+        }
+      });
+      return nickName;
+    },
   },
   },
   methods: {
   methods: {
     init() {
     init() {
@@ -8325,6 +8335,7 @@ export default {
           this.$set(this.form, "fDeptid", this.userVal.deptId);
           this.$set(this.form, "fDeptid", this.userVal.deptId);
           this.$set(this.form, "createBy", this.userVal.userName);
           this.$set(this.form, "createBy", this.userVal.userName);
           this.$set(this.form, "fStorekeeper", this.userVal.nickName);
           this.$set(this.form, "fStorekeeper", this.userVal.nickName);
+          this.$set(this.form, "fContacts", this.userVal.nickName);
           this.$set(this.form, "fIfdamage", "1");
           this.$set(this.form, "fIfdamage", "1");
           this.$set(this.form, "fIfweigh", "1");
           this.$set(this.form, "fIfweigh", "1");
           this.$set(this.form, "fTrademodeid", "1");
           this.$set(this.form, "fTrademodeid", "1");
@@ -8837,10 +8848,13 @@ export default {
     // 获取仓库信息
     // 获取仓库信息
     warehouseChange() {
     warehouseChange() {
       getDept(this.form.fWarehouseid).then(res => {
       getDept(this.form.fWarehouseid).then(res => {
-        this.$set(this.form, 'fContacts', res.data.fContacts)
+        // this.$set(this.form, 'fContacts', res.data.fContacts)
         this.$set(this.form, 'fTel', res.data.fTel)
         this.$set(this.form, 'fTel', res.data.fTel)
       })
       })
     },
     },
+    fStorekeeperChange() {
+      this.$set(this.form, 'fContacts', this.form.fStorekeeper)
+    },
     // 打印费用确认单准备
     // 打印费用确认单准备
     feesConfirm() {
     feesConfirm() {
       if (this.Collectionoptionss.length > 0) {
       if (this.Collectionoptionss.length > 0) {