bug

src/views/contractManage/contractBook/components/addDialog.vue

@@ -195,13 +195,13 @@
               v-model="form.categoryId"
               placeholder="请选择"
               style="width: 100%"
-              @change="getListCode"
             >
               <el-option
                 v-for="item in categoryList"
                 :key="item.id"
                 :label="item.name"
                 :value="item.id"
+                @click.native="getListCode()"
               >
               </el-option>
             </el-select>
@@ -999,10 +999,10 @@
       },
       //获取编码list
       async getListCode() {
-        let categoryData = this.categoryList.find(
-          (item) => item.id == this.form.categoryId
-        );
-        let list = await listCode(categoryData.code);
+        // let categoryData = this.categoryList.find(
+        //   (item) => item.id == this.form.categoryId
+        // );
+        let list = await listCode({id:this.form.categoryId});
         if (list?.length > 0) {
           this.$set(this.form, 'contractNumber', await getCode(list[0]?.id));
         } else {

src/views/saleManage/saleOrder/components/addDialog.vue

@@ -19,16 +19,7 @@
       label-width="120px"
       class="el-form-box"
     >
-      <headerTitle title="订单信息">
-        <el-button
-          type="primary"
-          size="mini"
-          style="margin-bottom: 5px"
-          @click="orderListShow"
-          v-if="!form.id"
-          >历史记录</el-button
-        >
-      </headerTitle>
+      <headerTitle title="订单信息"> </headerTitle>
       <el-row>
         <el-col :span="12">
           <el-form-item label="销售类型" prop="saleType">
@@ -282,7 +273,16 @@
         title="物品清单"
         style="margin-top: 30px"
         v-if="form.needProduce != 4"
-      ></headerTitle>
+      >
+        <el-button
+          type="primary"
+          size="mini"
+          style="margin-bottom: 5px"
+          @click="orderListShow"
+          v-if="!form.id"
+          >历史记录</el-button
+        ></headerTitle
+      >
       <inventoryTable
         v-if="form.needProduce != 4"
         :customerMark="customerMark"
@@ -858,12 +858,12 @@
         ].forEach((key) => {
           delete data[key];
           data.productList.forEach((item) => {
-            if (['id', 'createTime', 'createUserId','orderId'].includes(key)) {
+            if (['id', 'createTime', 'createUserId', 'orderId'].includes(key)) {
               delete item[key];
             }
           });
           data.typedetailList.forEach((item) => {
-            if (['id', 'createTime', 'createUserId','orderId'].includes(key)) {
+            if (['id', 'createTime', 'createUserId', 'orderId'].includes(key)) {
               delete item[key];
             }
           });

src/views/saleManage/saleOrder/components/darwerComponents/saleOrderInfo.vue

@@ -2,7 +2,7 @@
   <div>
     <el-form ref="form" class="el-form-box" :model="form" label-width="120px">
       <el-row>
-        <el-col :span="12">
+        <el-col :span="8">
           <el-form-item label="订单编号：" prop="orderNo">
             <el-input v-model="form.orderNo" disabled></el-input>
           </el-form-item>
@@ -19,15 +19,9 @@
           <el-form-item label="客户收货地址：" prop="receiveAddress">
             <el-input v-model="form.receiveAddress" disabled></el-input>
           </el-form-item>
-          <el-form-item label="订单备注：" prop="remark">
-            <el-input type="textarea" v-model="form.remark" disabled></el-input>
-          </el-form-item>
-          <el-form-item prop="orderFiles" label="订单附件：">
-            <fileMain v-model="form.orderFiles" type="view"></fileMain>
-          </el-form-item>
         </el-col>
 
-        <el-col :span="12">
+        <el-col :span="8">
           <el-form-item label="项目名称：" prop="projectName">
             <el-input v-model="form.projectName" disabled></el-input>
           </el-form-item>
@@ -37,23 +31,15 @@
           <el-form-item label="销售类型：" prop="saleTypeName">
             <el-input v-model="form.saleTypeName" disabled></el-input>
           </el-form-item>
-          <el-form-item label="总金额：" prop="totalAmount">
-            <el-input v-model="form.totalAmount" disabled>
-              <template slot="append"> 元 </template>
-            </el-input>
-          </el-form-item>
-          <el-form-item label="优惠后总金额：" prop="payAmount">
-            <el-input v-model="form.payAmount" disabled>
-              <template slot="append"> 元 </template>
-            </el-input>
-          </el-form-item>
 
           <el-form-item
-            label="订单类型"
+            label="订单类型："
             prop="needProduce"
             style="margin-bottom: 22px"
           >
-            <el-radio v-model="form.needProduce" :label="1">有客户生产性订单</el-radio>
+            <el-radio v-model="form.needProduce" disabled :label="1"
+              >有客户生产性订单</el-radio
+            >
             <el-radio v-model="form.needProduce" disabled :label="0"
               >库存式订单</el-radio
             >
@@ -68,6 +54,18 @@
               >不定向订单</el-radio
             >
           </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="总金额：" prop="totalAmount">
+            <el-input v-model="form.totalAmount" disabled>
+              <template slot="append"> 元 </template>
+            </el-input>
+          </el-form-item>
+          <el-form-item label="优惠后总金额：" prop="payAmount">
+            <el-input v-model="form.payAmount" disabled>
+              <template slot="append"> 元 </template>
+            </el-input>
+          </el-form-item>
           <el-form-item
             label="总数"
             prop="totalPlanNum"
@@ -84,6 +82,10 @@
               </template>
             </el-input>
           </el-form-item>
+
+          <el-form-item prop="orderFiles" label="订单附件：">
+            <fileMain v-model="form.orderFiles" type="view"></fileMain>
+          </el-form-item>
         </el-col>
       </el-row>
       <el-row>
@@ -161,6 +163,9 @@
             <el-input v-model="form.createTime" disabled></el-input>
           </el-form-item>
         </el-col>
+        <el-form-item label="备注：" prop="remark">
+          <el-input type="textarea" v-model="form.remark" disabled></el-input>
+        </el-form-item>
       </el-row>
     </el-form>
 
@@ -184,49 +189,51 @@
 </template>
 
 <script>
-import { getFile } from '@/api/system/file';
-import inventoryTabledetail from '@/BIZComponents/inventoryTableDetails.vue';
-// import fileMain from '@/components/addDoc/index.vue';
-import typeList from '../typeList.vue';
+  import { getFile } from '@/api/system/file';
+  import inventoryTabledetail from '@/BIZComponents/inventoryTableDetails.vue';
+  // import fileMain from '@/components/addDoc/index.vue';
+  import typeList from '../typeList.vue';
 
-import dictMixins from '@/mixins/dictMixins';
-export default {
-  mixins: [dictMixins],
-  components: { inventoryTabledetail,
-    //  fileMain, 
-     typeList },
-  data() {
-    return {
-      form: {}
-    };
-  },
-  computed: {
+  import dictMixins from '@/mixins/dictMixins';
+  export default {
+    mixins: [dictMixins],
+    components: {
+      inventoryTabledetail,
+      //  fileMain,
+      typeList
+    },
+    data() {
+      return {
+        form: {}
+      };
+    },
+    computed: {
       clientEnvironmentId() {
         return this.$store.state.user.info.clientEnvironmentId;
       }
     },
-  methods: {
-    async init(row) {
-      console.log(row,'rowsdds')
-      this.form = row;
-      this.$nextTick(() => {
-        this.$refs.inventoryTabledetailRef &&
-          this.$refs.inventoryTabledetailRef.putTableValue(row);
-        this.$refs.typeListRef &&
-          this.$refs.typeListRef.putTableValue(row.typedetailList);
-      });
-    },
+    methods: {
+      async init(row) {
+        console.log(row, 'rowsdds');
+        this.form = row;
+        this.$nextTick(() => {
+          this.$refs.inventoryTabledetailRef &&
+            this.$refs.inventoryTabledetailRef.putTableValue(row);
+          this.$refs.typeListRef &&
+            this.$refs.typeListRef.putTableValue(row.typedetailList);
+        });
+      },
 
-    downloadFile(file) {
-      getFile({ objectName: file.storePath }, file.name);
+      downloadFile(file) {
+        getFile({ objectName: file.storePath }, file.name);
+      }
     }
-  }
-};
+  };
 </script>
 <style lang="scss" scoped>
-.totalPlanNum {
-  :deep(.el-input-group__append) {
-    width: 160px;
+  .totalPlanNum {
+    :deep(.el-input-group__append) {
+      width: 160px;
+    }
   }
-}
 </style>