振大

src/BIZComponents/product-list.vue

@@ -139,6 +139,8 @@
             :row-class-name="tableRowClassName"
             :initLoad="!isFirstRefreshTable"
             @columns-change="handleColumnChange"
+            :rowClickChecked="true"
+
             :cache-key="'product-list-cache-key'"
           >
             <!-- 表头工具栏 -->

src/views/contractManage/contractBook/index.vue

@@ -98,9 +98,30 @@
                 >
                   提交
                 </el-link>
+                <!-- 销售订单 -->
                 <el-link
                   type="primary"
-                  v-if="[2].includes(row.status) && !row.hasGeneratedOrder"
+                  v-if="
+                    [2].includes(row.status) &&
+                    !row.hasGeneratedOrder &&
+                    row.type == 1
+                  "
+                  :underline="false"
+                  icon="el-icon-plus"
+                  @click="handleGenerateOrder(row)"
+                >
+                  生成订单
+                </el-link>
+                <!-- 采购订单 -->
+
+                <el-link
+                  type="primary"
+                  v-if="
+                    [2].includes(row.status) &&
+                    row.type == 2 &&
+                    ((isAddPurchaseOrder == 1 && !row.hasGeneratedOrder) ||
+                      isAddPurchaseOrder == 0)
+                  "
                   :underline="false"
                   icon="el-icon-plus"
                   @click="handleGenerateOrder(row)"
@@ -263,6 +284,7 @@
         addOrEditDialogFlag: false,
         treeList: [], //左边分类数据
         extInfo: {},
+        isAddPurchaseOrder: 0,
         columns: [
           {
             width: 45,
@@ -461,7 +483,13 @@
           this.isRequired = res.value === '1';
         }
       });
-
+      parameterGetByCode({
+        code: 'eom_contractBook_add_purchaseOrder'
+      }).then((res) => {
+        if (res.value) {
+          this.isAddPurchaseOrder = res.value || 0;
+        }
+      });
       if (this.$route.query.isView) {
         this.$nextTick(() => {
           this.openDetail({

src/views/purchasingManage/inquiryManage/index.vue

@@ -65,7 +65,6 @@
               {{ row.planCode }}</el-link
             >
           </template>
-       
 
           <!-- 操作列 -->
           <template v-slot:action="{ row }">
@@ -95,7 +94,11 @@
               :underline="false"
               icon="el-icon-plus"
               @click="addGenerateContract([row])"
-              v-if="[2].includes(row.status)"
+              v-if="
+                [2].includes(row.status) &&
+                ((isAddContract == 1 && row.genContractNum == 0) ||
+                  isAddContract == 0)
+              "
             >
               生成合同
             </el-link>
@@ -167,6 +170,7 @@
   import processSubmitDialog from '@/BIZComponents/processSubmitDialog/processSubmitDialog.vue';
   import tabMixins from '@/mixins/tableColumnsMixin';
   import { reviewStatus } from '@/enum/dict';
+  import { parameterGetByCode } from '@/api/main/index.js';
 
   export default {
     mixins: [dictMixins, tabMixins],
@@ -197,6 +201,7 @@
         processSubmitDialogFlag: false,
         loading: false, // 加载状态
         treeList: [],
+        isAddContract: 0,
         columns: [
           {
             width: 45,
@@ -316,9 +321,9 @@
             label: '状态',
             align: 'center',
             formatter: (_row, _column, cellValue) => {
-              return reviewStatus[cellValue]
+              return reviewStatus[cellValue];
             },
-          
+
             showOverflowTooltip: true,
             minWidth: 120
           },
@@ -346,6 +351,12 @@
     computed: {},
     created() {
       this.getTreeData();
+      //是否可以重复生成合同//0否 1是
+      parameterGetByCode({
+        code: 'eom_inquiry_add_contract'
+      }).then((res) => {
+        this.isAddContract = res.value || 0;
+      });
     },
     methods: {
       /* 表格数据源 */
@@ -353,7 +364,7 @@
         if (this.purchasePlanId) {
           where['planId'] = this.purchasePlanId;
         }
-        if(this.sonPurchasePlanIds){
+        if (this.sonPurchasePlanIds) {
           where['planIds'] = this.sonPurchasePlanIds;
         }
         return getTableList({
@@ -537,8 +548,7 @@
         //   .catch((e) => {
         //     this.$message.error(e.message);
         //   });
-      },
-
+      }
     }
   };
 </script>

src/views/purchasingManage/supplierManage/components/contactSearch.vue

@@ -3,97 +3,97 @@
   <seekPage :seekList="seekList" :formLength="3" @search="search"></seekPage>
 </template>
 <script>
-import { StateType,  } from '@/enum/dict';
+  import { StateType } from '@/enum/dict';
 
-export default {
-  data() {
-    return {};
-  },
-  computed: {
-    // 表格列配置
-    seekList() {
-      return [
-        {
-          label: '关键字：',
-          value: 'searchName',
-          type: 'input',
-          placeholder: '编码/名称/代号/电话'
-        },
-        {
-          label: '编码：',
-          value: 'code',
-          type: 'input',
-          placeholder: '请输入'
-        },
-        {
-          label: '名称：',
-          value: 'name',
-          type: 'input',
-          placeholder: '请输入',
-        },
-        // {
-        //   label: '代号：',
-        //   value: 'serialNo',
-        //   width: 380,
-        //   type: 'input',
-        //   placeholder: '请输入',
-        // },
-        // {
-        //   label: '电话：',
-        //   value: 'phone',
-        //   width: 380,
-        //   type: 'input',
-        //   placeholder: '请输入'
-        // },
-        // {
-        //   label: '联系人：',
-        //   value: 'linkName',
-        //   width: 380,
-        //   type: 'input',
-        //   placeholder: '请输入'
-        // },
-        // {
-        //   label: '联系人电话：',
-        //   value: 'linkPhone',
-        //   width: 360,
-        //   labelWidth:130,
-        //   type: 'input',
-        //   placeholder: '请输入'
-        // },
-        // {
-        //   label: '状态：',
-        //   value: 'status',
-        //   width: 380,
-        //   type: 'select',
-        //   placeholder: '请选择状态',
-        //   planList: StateType
-        // },
-        // {
-        //   label: '创建人：',
-        //   value: 'createUsername',
-        //   width: 380,
-        //   type: 'input',
-        //   placeholder: '请输入'
-        // },
-        {
-          label: '创建时间：',
-          value: 'createTime',
-          type: 'date',
-          dateType: 'datetimerange',
-          placeholder: '',
-          width: 380,
-          valueAr: ['createTimeStart', 'createTimeEnd']
-        },
-      ];
+  export default {
+    data() {
+      return {};
+    },
+    computed: {
+      // 表格列配置
+      seekList() {
+        return [
+          {
+            label: '关键字：',
+            value: 'searchName',
+            type: 'input',
+            placeholder: '编码/名称/代号/电话'
+          },
+          {
+            label: '编码/代号：',
+            value: 'codeOrSerialNo',
+            type: 'input',
+            placeholder: '请输入'
+          },
+          {
+            label: '名称：',
+            value: 'name',
+            type: 'input',
+            placeholder: '请输入'
+          },
+          // {
+          //   label: '代号：',
+          //   value: 'serialNo',
+          //   width: 380,
+          //   type: 'input',
+          //   placeholder: '请输入',
+          // },
+          // {
+          //   label: '电话：',
+          //   value: 'phone',
+          //   width: 380,
+          //   type: 'input',
+          //   placeholder: '请输入'
+          // },
+          // {
+          //   label: '联系人：',
+          //   value: 'linkName',
+          //   width: 380,
+          //   type: 'input',
+          //   placeholder: '请输入'
+          // },
+          // {
+          //   label: '联系人电话：',
+          //   value: 'linkPhone',
+          //   width: 360,
+          //   labelWidth:130,
+          //   type: 'input',
+          //   placeholder: '请输入'
+          // },
+          // {
+          //   label: '状态：',
+          //   value: 'status',
+          //   width: 380,
+          //   type: 'select',
+          //   placeholder: '请选择状态',
+          //   planList: StateType
+          // },
+          // {
+          //   label: '创建人：',
+          //   value: 'createUsername',
+          //   width: 380,
+          //   type: 'input',
+          //   placeholder: '请输入'
+          // },
+          {
+            label: '创建时间：',
+            value: 'createTime',
+            type: 'date',
+            dateType: 'datetimerange',
+            placeholder: '',
+            width: 380,
+            valueAr: ['createTimeStart', 'createTimeEnd']
+          }
+        ];
+      }
+    },
+    methods: {
+      /* 搜索 */
+      search(e) {
+        this.$emit('search', {
+          ...e
+        });
+      }
     }
-  },
-  methods: {
-    /* 搜索 */
-    search(e) {
-      this.$emit('search', {
-        ...e
-      });
-    }
-  }
-};
+  };
 </script>

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

@@ -37,6 +37,7 @@
             height="calc(100vh - 500px)"
             class="dict-table"
             @cell-click="cellClick"
+            :rowClickChecked="true"
           >
             <!-- 表头工具栏 -->
             <template v-slot:action="{ row }">

src/views/saleManage/saleOrder/entrustedReceive/components/inventoryTable.vue

@@ -10,7 +10,6 @@
       :selection.sync="selection"
       class="time-form"
       :maxHeight="350"
-
     >
       <!-- 表头工具栏 -->
       <template v-slot:toolbar>
@@ -91,6 +90,15 @@
           ></el-input>
         </el-form-item>
       </template>
+      <template v-slot:batchNo="scope">
+        <el-form-item
+          style="margin-bottom: 20px"
+          :prop="'datasource.' + scope.$index + '.batchNo'"
+        >
+          <el-input v-model="scope.row.batchNo" type="number"></el-input>
+        </el-form-item>
+      </template>
+
       <template v-slot:singlePrice="scope">
         <el-form-item
           style="margin-bottom: 20px"
@@ -267,9 +275,10 @@
           {
             prop: 'batchNo',
             label: '批次号',
+            slot: 'batchNo',
             align: 'center',
             showOverflowTooltip: true,
-            minWidth: 100
+            minWidth: 150
           },
           {
             minWidth: 100,

src/views/saleManage/saleOrder/index.vue

@@ -412,7 +412,7 @@
       parameterGetByCode({
         code: 'saleOrder_invoice_productList_totalCount'
       }).then((res) => {
-        this.isTotalCount == res.value;
+        this.isTotalCount = res.value;
       });
       // if (!('Notification' in window)) {
       //   console.log('此浏览器不支持桌面通知');