js 订单类型修改

src/BIZComponents/inventoryTable.vue

@@ -1588,7 +1588,7 @@
           this.$set(parasm, 'specification', item.specification);
           this.$set(parasm, 'weightUnit', item.weightUnit);
           this.$set(parasm, 'singleWeight', item.weight);
-          this.$set(parasm, 'pricingWay', item.pricingWay || 1);
+          this.$set(parasm, 'pricingWay',  1);
           this.$set(parasm, 'arrivalWay', item.arrivalWay || 1);
 
           this.$set(parasm, 'imgCode', '');

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

@@ -53,16 +53,20 @@
             prop="needProduce"
             style="margin-bottom: 22px"
           >
-            <el-radio v-model="form.needProduce" disabled :label="1"
-              >生产性订单</el-radio
-            >
+            <el-radio v-model="form.needProduce" :label="1">{{
+              clientEnvironmentId == 5 ? '有客户生产性订单' : '生产性订单'
+            }}</el-radio>
             <el-radio v-model="form.needProduce" disabled :label="0"
               >库存式订单</el-radio
             >
             <el-radio v-model="form.needProduce" disabled :label="2"
               >无客户生产性订单</el-radio
             >
-            <el-radio v-model="form.needProduce" disabled :label="4"
+            <el-radio
+              v-model="form.needProduce"
+              disabled
+              :label="4"
+              v-if="clientEnvironmentId != 5"
               >不定向订单</el-radio
             >
           </el-form-item>
@@ -172,46 +176,55 @@
       pageName="send"
     ></inventoryTabledetail>
     <headerTitle title="类型清单" v-if="form.needProduce == 4"></headerTitle>
-    <typeList v-if="form.needProduce == 4" ref="typeListRef" type="view"></typeList>
+    <typeList
+      v-if="form.needProduce == 4"
+      ref="typeListRef"
+      type="view"
+    ></typeList>
   </div>
 </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: {}
-      };
+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) {
+      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) {
-        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>

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

@@ -27,12 +27,7 @@
       </div>
     </div>
     <div v-show="activeComp == 'order'">
-      <el-form
-        ref="form"
-        class="el-form-box"
-        :model="form"
-        label-width="120px"
-      >
+      <el-form ref="form" class="el-form-box" :model="form" label-width="120px">
         <headerTitle title="订单信息"> </headerTitle>
         <el-row>
           <el-col :span="12">
@@ -89,16 +84,16 @@
               prop="needProduce"
               style="margin-bottom: 22px"
             >
-              <el-radio v-model="form.needProduce" disabled :label="1"
-                >生产性订单</el-radio
-              >
+              <el-radio v-model="form.needProduce" :label="1">{{
+                clientEnvironmentId == 5 ? '有客户生产性订单' : '生产性订单'
+              }}</el-radio>
               <el-radio v-model="form.needProduce" disabled :label="0"
                 >库存式订单</el-radio
               >
               <el-radio v-model="form.needProduce" disabled :label="2"
                 >无客户生产性订单</el-radio
               >
-              <el-radio v-model="form.needProduce" disabled :label="4"
+              <el-radio v-model="form.needProduce" disabled :label="4"   v-if="clientEnvironmentId != 5"
                 >不定向订单</el-radio
               >
             </el-form-item>
@@ -155,7 +150,6 @@
             <el-form-item label="客户地址：" prop="partaAddress">
               <el-input v-model="form.partaAddress" disabled></el-input>
             </el-form-item>
-        
           </el-col>
 
           <el-col :span="12">
@@ -193,7 +187,6 @@
             <el-form-item label="售出方地址：" prop="partbAddress">
               <el-input v-model="form.partbAddress" disabled></el-input>
             </el-form-item>
-     
           </el-col>
         </el-row>
       </el-form>
@@ -205,7 +198,6 @@
         :isCustomerMark="true"
         :isDiscountTotalPrice="true"
         :isArrivalWay="true"
-
         pageName="send"
       ></inventoryTabledetail>
       <headerTitle title="类型清单" v-if="form.needProduce == 4"></headerTitle>
@@ -236,114 +228,119 @@
 </template>
 
 <script>
-  import { getSaleOrderDetail } from '@/api/saleManage/saleorder';
-  import invoiceList from '@/views/saleManage/saleOrder/orderAssociation/invoiceList.vue';
-  import returnGoodsList from '@/views/saleManage/saleOrder/orderAssociation/returnGoodsList.vue';
-  import accountstatementList from '@/views/saleManage/saleOrder/orderAssociation/accountstatementList.vue';
-  import { getFile } from '@/api/system/file';
-  import dictMixins from '@/mixins/dictMixins';
-  import { copyObj } from '@/utils/util';
-  import bpmDetail from '@/views/bpm/processInstance/detail.vue';
-  import inventoryTabledetail from '@/BIZComponents/inventoryTableDetails.vue';
-  import fileMain from '@/components/addDoc/index.vue';
-  import typeList from './typeList.vue';
+import { getSaleOrderDetail } from '@/api/saleManage/saleorder';
+import invoiceList from '@/views/saleManage/saleOrder/orderAssociation/invoiceList.vue';
+import returnGoodsList from '@/views/saleManage/saleOrder/orderAssociation/returnGoodsList.vue';
+import accountstatementList from '@/views/saleManage/saleOrder/orderAssociation/accountstatementList.vue';
+import { getFile } from '@/api/system/file';
+import dictMixins from '@/mixins/dictMixins';
+import { copyObj } from '@/utils/util';
+import bpmDetail from '@/views/bpm/processInstance/detail.vue';
+import inventoryTabledetail from '@/BIZComponents/inventoryTableDetails.vue';
+import fileMain from '@/components/addDoc/index.vue';
+import typeList from './typeList.vue';
 
-  export default {
-    mixins: [dictMixins],
-    components: {
-      fileMain,
-      invoiceList,
-      returnGoodsList,
-      accountstatementList,
-      bpmDetail,
-      inventoryTabledetail,
-      typeList
+export default {
+  mixins: [dictMixins],
+  components: {
+    fileMain,
+    invoiceList,
+    returnGoodsList,
+    accountstatementList,
+    bpmDetail,
+    inventoryTabledetail,
+    typeList
+  },
+  data() {
+    return {
+      activeComp: 'order',
+      tabOptions: [
+        { key: 'order', name: '订单详情' },
+        { key: 'bpm', name: '流程详情' },
+        { key: 'invoice', name: '发货列表' },
+        { key: 'returnorder', name: '退货列表' },
+        { key: 'accountstatement', name: '对账列表' }
+      ],
+      visible: false,
+      detailId: '',
+      title: '详情',
+      form: {
+        orderFiles: []
+      }
+    };
+  },
+  computed: {
+      clientEnvironmentId() {
+        return this.$store.state.user.info.clientEnvironmentId;
+      }
     },
-    data() {
-      return {
-        activeComp: 'order',
-        tabOptions: [
-          { key: 'order', name: '订单详情' },
-          { key: 'bpm', name: '流程详情' },
-          { key: 'invoice', name: '发货列表' },
-          { key: 'returnorder', name: '退货列表' },
-          { key: 'accountstatement', name: '对账列表' }
-        ],
-        visible: false,
-        detailId: '',
-        title: '详情',
-        form: {
-          orderFiles: []
-        },
-      };
+  methods: {
+    async open(row) {
+      this.form = row;
+      this.visible = true;
+      this.getDetailData(row.id);
+      this.detailId = row.id;
     },
-    methods: {
-      async open(row) {
-        this.form = row;
-        this.visible = true;
-        this.getDetailData(row.id);
-        this.detailId = row.id;
-      },
-      toSendTab(tabName) {
-        this.activeComp = tabName;
-      },
-      cancel() {
+    toSendTab(tabName) {
+      this.activeComp = tabName;
+    },
+    cancel() {
+      this.$nextTick(() => {
+        // 关闭后，销毁所有的表单数据
+        (this.form = copyObj(this.formDef)),
+          (this.otherForm = copyObj(this.otherFormDef)),
+          (this.tableBankData = []);
+        this.tableLinkData = [];
+        this.visible = false;
+      });
+    },
+
+    async getDetailData(id) {
+      this.loading = true;
+      const data = await getSaleOrderDetail(id);
+      this.loading = false;
+      if (data) {
+        this.form = data;
         this.$nextTick(() => {
-          // 关闭后，销毁所有的表单数据
-          (this.form = copyObj(this.formDef)),
-            (this.otherForm = copyObj(this.otherFormDef)),
-            (this.tableBankData = []);
-          this.tableLinkData = [];
-          this.visible = false;
+          this.$refs.inventoryTabledetailRef &&
+            this.$refs.inventoryTabledetailRef.putTableValue(data);
+          this.$refs.typeListRef &&
+            this.$refs.typeListRef.putTableValue(data.typedetailList);
         });
-      },
-
-      async getDetailData(id) {
-        this.loading = true;
-        const data = await getSaleOrderDetail(id);
-        this.loading = false;
-        if (data) {
-          this.form = data;
-          this.$nextTick(() => {
-            this.$refs.inventoryTabledetailRef &&
-              this.$refs.inventoryTabledetailRef.putTableValue(data);
-            this.$refs.typeListRef &&
-              this.$refs.typeListRef.putTableValue(data.typedetailList);
-          });
-        }
       }
     }
-  };
+  }
+};
 </script>
 
 <style scoped lang="scss">
-  .ele-dialog-form {
-    .el-form-item {
-      margin-bottom: 10px;
-    }
+.ele-dialog-form {
+  .el-form-item {
+    margin-bottom: 10px;
   }
+}
 
-  .headbox {
-    display: flex;
-    justify-content: flex-start;
-    align-items: center;
-    .amount {
-      font-size: 14px;
-      font-weight: bold;
-      margin-right: 20px;
-    }
+.headbox {
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
+  .amount {
+    font-size: 14px;
+    font-weight: bold;
+    margin-right: 20px;
   }
+}
 
-  .switch_left ul .active {
-    border-top: 4px solid var(--color-primary);
-    color: var(--color-primary-5);
-  }
+.switch_left ul .active {
+  border-top: 4px solid var(--color-primary);
+  color: var(--color-primary-5);
+}
 
-  .switch {
-    padding-bottom: 20px;
-  }
+.switch {
+  padding-bottom: 20px;
+}
 
-  :deep .divider .content {
-    justify-content: flex-start;
-  }
+:deep .divider .content {
+  justify-content: flex-start;
+}
 </style>