自动生成订单

src/views/commodityManagement/commodityPriceList/components/historicalpriceDialog.vue

@@ -29,7 +29,7 @@
     >
     </ele-pro-table> -->
     <el-container>
-      <el-table :data="data" style="width: 100%">
+      <el-table :data="list" style="width: 100%">
         <el-table-column prop="date" label="日期"> </el-table-column>
         <el-table-column prop="price" label="价格"> </el-table-column>
       </el-table>
@@ -44,6 +44,8 @@
   import { CanvasRenderer } from 'echarts/renderers';
   import { BarChart, PieChart, LineChart } from 'echarts/charts';
   import { getHistoryList } from '@/api/goodsManage/index';
+  import { echartsMixin } from '@/utils/echarts-mixin';
+
   import {
     GridComponent,
     TooltipComponent,
@@ -62,6 +64,8 @@
 
   export default {
     components: { PriceSearch, VChart },
+    mixins: [echartsMixin(['lineRef'])],
+
     data() {
       return {
         title: '价格历史趋势',
@@ -148,7 +152,7 @@
             align: 'center'
           }
         ],
-        data: {}
+        list: []
       };
     },
     mounted() {},
@@ -156,15 +160,7 @@
       async open(row) {
         this.visible = true;
         let res = await getHistoryList(row.id);
-        // const list = res.map((item) => {
-        //   const date = Object.keys(item)[0];
-        //   const price = item[key];
-        //   return { date, price };
-        // })
-        // debugger;
         let date = Object.keys(res);
-
-        // console.log(,'res')
         this.lineOption = {
           tooltip: {
             trigger: 'item'
@@ -173,7 +169,7 @@
             itemGap: window.innerHeight * 0.014
           },
           grid: {
-            left: '5%',
+            left: '10%',
             right: '5%',
             bottom: '8%'
           },
@@ -203,7 +199,7 @@
             }
           ]
         };
-        this.data = date.map((item, index) => {
+        this.list = date.map((item, index) => {
           let newDate = null;
           if (date[index + 1]) {
             newDate =

src/views/purchasingManage/purchasePlanManage/components/addDialog.vue

@@ -12,7 +12,7 @@
     :maxable="true"
     :resizable="true"
   >
-    <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+    <el-form ref="form" :model="form" :rules="rules" label-width="140px">
       <headerTitle title="基本信息"></headerTitle>
       <el-row>
         <el-col :span="12">
@@ -110,7 +110,7 @@
         </el-col>
 
         <el-col :span="12">
-          <el-form-item prop="remark" label="是否接受拆单" label-width="120px">
+          <el-form-item prop="remark" label="是否接受拆单" >
             <el-radio-group
               v-model="form.acceptUnpack"
               :disabled="!!form.requirementCode"
@@ -122,7 +122,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item prop="remark" label="是否需要核价" label-width="120px">
+          <el-form-item prop="remark" label="是否需要核价" >
             <el-radio-group v-model="form.needInquiry">
               <el-radio v-for="item in needInquiryList" :label="item.value">{{
                 item.label
@@ -130,7 +130,22 @@
             </el-radio-group>
           </el-form-item>
         </el-col>
-
+        <el-col :span="12">
+          <el-form-item prop="remark" label="是否自动生成订单" >
+            <el-radio-group v-model="form.isGenerateOrder">
+              <el-radio :label="1">是</el-radio>
+              <el-radio :label="0">否</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item prop="remark" label="是否自动生成合同" >
+            <el-radio-group v-model="form.isGenerateContract">
+              <el-radio :label="1">是</el-radio>
+              <el-radio :label="0">否</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
         <el-col :span="12">
           <el-form-item prop="files" label="附件">
             <fileMain v-model="form.files"></fileMain>
@@ -167,6 +182,7 @@
           :needInquiry="form.needInquiry"
           ref="inventoryTable"
           :sourceType="form.sourceType"
+          :isSupplier="Boolean(form.isGenerateOrder==1||form.isGenerateContract==1)"
         ></inventoryTable>
       </el-tab-pane>
       <el-tab-pane
@@ -282,7 +298,9 @@
         sourceTypeName: '',
         acceptUnpack: 1,
         needInquiry: 1,
-        isFirstProcess: 0
+        isFirstProcess: 0,
+        isGenerateOrder:0,
+        isGenerateContract:0,
       };
 
       return {

src/views/purchasingManage/purchasePlanManage/components/detailDialog.vue

@@ -28,7 +28,7 @@
       </div>
     </div>
     <div v-show="activeComp == 'main'">
-      <el-form ref="form" :model="form" class="el-form-box" label-width="120px">
+      <el-form ref="form" :model="form" class="el-form-box" label-width="140px">
         <headerTitle title="基本信息"> </headerTitle>
         <el-row>
           <el-col :span="form?.sourceId ? 8 : 12">
@@ -45,7 +45,7 @@
             <el-form-item prop="remark" label="是否接受拆单：">
               <el-select
                 v-model="form.acceptUnpack"
-                placeholder="请选择"
+                placeholder=" "
                 disabled
                 style="width: 100%"
               >
@@ -53,13 +53,26 @@
                 <el-option label="不接受" :value="0"></el-option>
               </el-select>
             </el-form-item>
+            <el-form-item prop="isGenerateOrder" label="是否自动生成订单：">
+              <el-select
+                v-model="form.isGenerateOrder"
+                placeholder=" "
+                disabled
+                style="width: 100%"
+              >
+                <el-option label="是" :value="1"></el-option>
+                <el-option label="否" :value="0"></el-option>
+              </el-select>
+            </el-form-item>
             <el-form-item label="完结日期：" prop="receiveDate">
               <el-input v-model="form.receiveDate" disabled></el-input>
             </el-form-item>
+            
             <el-form-item prop="files" label="附件：">
               <fileMain v-model="form.files" type="view"></fileMain>
             </el-form-item>
           </el-col>
+
           <el-col :span="form?.sourceId ? 8 : 12">
             <el-form-item label="需求单名称：" prop="requirementCode">
               <el-input v-model="form.requirementName" disabled>
@@ -90,6 +103,17 @@
                 <el-option label="否" :value="0"></el-option>
               </el-select>
             </el-form-item>
+            <el-form-item prop="isGenerateContract" label="是否自动生成合同：">
+              <el-select
+                v-model="form.isGenerateContract"
+                placeholder=" "
+                disabled
+                style="width: 100%"
+              >
+                <el-option label="是" :value="1"></el-option>
+                <el-option label="否" :value="0"></el-option>
+              </el-select>
+            </el-form-item>
             <el-form-item prop="remark" label="备注：">
               <el-input v-model="form.remark" disabled></el-input>
             </el-form-item>

src/views/purchasingManage/purchasePlanManage/components/inventoryTable.vue

@@ -317,6 +317,12 @@
         <el-form-item
           style="margin-bottom: 20px"
           :prop="'datasource.' + scope.$index + '.supplierName'"
+          :rules="{
+            required: isSupplier?true:false,
+            trigger: 'change',
+            message: '请选择供应商',
+          }"
+          
         >
           <el-input
             clearable
@@ -350,7 +356,7 @@
         <span class="is-required">{{ column.label }}</span>
       </template>
       <template v-slot:headerSupplierName="{ column }">
-        <span :class="{ 'is-required': isNeedInquiry === 1 }">{{
+        <span :class="{ 'is-required': isSupplier }">{{
           column.label
         }}</span>
       </template>
@@ -458,9 +464,9 @@
   export default {
     mixins: [dictMixins, tabMixins],
     props: {
-      needInquiry: {
-        type: Number,
-        default: 1
+      isSupplier: {
+        type: Boolean,
+        default: false
       },
       detailType: {
         type: Number,
@@ -481,16 +487,7 @@
       warehouseAll
     },
     computed: {
-      isNeedInquiry() {
-        if (this.needInquiry === 1) {
-          // this.form.datasource.forEach(item => {
-          //   item.supplierCode = ''
-          //   item.supplierId = ''
-          //   item.supplierName = ''
-          // })
-        }
-        return this.needInquiry;
-      },
+   
       columns() {
         return [
           {

src/views/purchasingManage/purchasePlanManage/index.vue

@@ -103,7 +103,7 @@
               (!row.parentId || row.parentId == 0) &&
               [0].includes(row.progress) &&
               !orderSourceType.includes(row.sourceType) &&
-              row.acceptUnpack == 1
+              row.acceptUnpack == 1&&row.isGenerateOrder!=1&&row.isGenerateContract!=1
             "
             @click="handleSplit(row)"
           >