Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-aps into dev

src/views/productionPlan/components/productionPlan-search.vue

@@ -9,13 +9,18 @@
     <el-row :gutter="15">
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="计划编号:">
-          <el-input size="mini" clearable v-model="where.code" placeholder="请输入" />
+          <el-input
+            size="mini"
+            clearable
+            v-model="where.code"
+            placeholder="请输入"
+          />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="产品编码:">
           <el-input
-           size="mini"
+            size="mini"
             clearable
             v-model="where.productCode"
             placeholder="请输入"
@@ -24,23 +29,32 @@
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="牌号:" label-width="80px">
-          <el-input size="mini" clearable v-model="where.brandNo" placeholder="请输入" />
+          <el-input
+            size="mini"
+            clearable
+            v-model="where.brandNo"
+            placeholder="请输入"
+          />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="型号:" label-width="80px">
-          <el-input size="mini" clearable v-model="where.model" placeholder="请输入" />
+          <el-input
+            size="mini"
+            clearable
+            v-model="where.model"
+            placeholder="请输入"
+          />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item size="mini" label="计划类型:" label-width="80px">
           <el-select
-        size="mini"
+            size="mini"
             clearable
             v-model="where.planType"
             placeholder="请选择"
             class="w100"
-           
           >
             <el-option
               v-for="item in planType"
@@ -53,7 +67,12 @@
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="计划状态:" label-width="80px">
-          <el-select size="mini" v-model="where.status" placeholder="请选择" class="w100">
+          <el-select
+            size="mini"
+            v-model="where.status"
+            placeholder="请选择"
+            class="w100"
+          >
             <el-option
               v-for="item in statusOpt[activeName]"
               :label="item.label"
@@ -70,7 +89,7 @@
         <el-form-item label-width="150px">
           <template slot="label">
             <el-select
-            size="mini"
+              size="mini"
               v-model="deliveryVal"
               @change="
                 () => {
@@ -100,7 +119,7 @@
         <el-form-item label="" label-width="150px">
           <template slot="label">
             <el-select
-             size="mini"
+              size="mini"
               v-model="shapeVal"
               @change="
                 () => {
@@ -119,7 +138,7 @@
             </el-select>
           </template>
           <el-date-picker
-           size="mini"
+            size="mini"
             class="w100"
             v-model="where[shapeVal]"
             type="daterange"
@@ -139,6 +158,7 @@
         <el-form-item label="工单发布时间:" label-width="150px">
           <el-date-picker
             class="w100"
+            size="mini"
             v-model="where.releaseTime"
             type="daterange"
             range-separator="至"
@@ -150,25 +170,20 @@
           </el-date-picker>
         </el-form-item>
       </el-col>
-      <el-col
-        v-bind="
-          styleResponsive
-            ? { lg: activeName == 'first' ? 24 : 6, md: 12 }
-            : { span: activeName == 'first' ? 24 : 6 }
-        "
-      >
-        <el-col v-bind="styleResponsive ? { lg: 6, md: 6 } : { span: 6 }">
-          <el-form-item label="组织机构:">
-            <auth-selection  size="mini" data-type="Array" v-model="where.deptIds" style="width: 100%"></auth-selection>
-          </el-form-item>
-        </el-col>
+
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 6 } : { span: 6 }">
+        <el-form-item label="组织机构:">
+          <auth-selection
+            size="mini"
+            data-type="Array"
+            v-model="where.deptIds"
+          ></auth-selection>
+        </el-form-item>
+      </el-col>
+
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 6 } : { span: 6 }">
         <div class="ele-form-actions">
-          <el-button
-            type="primary"
-            icon="el-icon-search"
-            class="ele-btn-icon"
-            @click="search"
-          >
+          <el-button type="primary" icon="el-icon-search" @click="search">
             查询
           </el-button>
           <el-button @click="reset" icon="el-icon-refresh-left" type="primary"
@@ -183,7 +198,7 @@
 <script>
   export default {
     props: ['activeName', 'statusOpt', 'planType'],
-    data () {
+    data() {
       // 默认表单数据
       const defaultWhere = {
         code: '',
@@ -210,13 +225,13 @@
     },
     computed: {
       // 是否开启响应式布局
-      styleResponsive () {
+      styleResponsive() {
         return this.$store.state.theme.styleResponsive;
       }
     },
     watch: {
       activeName: {
-        handler () {
+        handler() {
           if (this.activeName) {
             this.where.status = this.statusOpt[this.activeName][0].value;
             this.reset();
@@ -225,13 +240,13 @@
         immediate: true
       }
     },
-    created () {},
+    created() {},
     methods: {
       /* 搜索 */
-      search () {
+      search() {
         const where = { ...this.where };
         for (const key in where) {
-          if (Array.isArray(where[key])&&key!=='deptIds') {
+          if (Array.isArray(where[key]) && key !== 'deptIds') {
             where[`${key}End`] = where[key][1];
             where[key] = where[key][0];
           }
@@ -242,7 +257,7 @@
         this.$emit('search', where);
       },
       /*  重置 */
-      reset () {
+      reset() {
         this.where = { ...this.defaultWhere };
         this.where.status = this.statusOpt[this.activeName][0].value;
         this.search();

src/views/productionPlan/components/unpackDialog.vue

@@ -26,7 +26,7 @@
             {{ formData.brandNo }}|{{ formData.model }}</el-descriptions-item
           >
 
-          <el-descriptions-item label="批次号">{{
+          <el-descriptions-item label="子批次号">{{
             formData.batchNo
           }}</el-descriptions-item>
 
@@ -43,7 +43,7 @@
         </el-descriptions>
       </el-form>
 
-      <headerTitle title="剩余拆单" class="mt20"> </headerTitle>
+      <headerTitle title="剩余拆批" class="mt20"> </headerTitle>
       <el-form ref="form" :model="form" :rules="rules">
         <ele-pro-table
           ref="table"
@@ -60,7 +60,7 @@
               :disabled="requiredFormingNum == 0 ? true : false"
               @click="openUnpack"
             >
-              拆单
+              拆批
             </el-button>
           </template>
 
@@ -76,7 +76,7 @@
                 },
                 {
                   pattern: /^\d+(\.{0,1}\d+){0,1}$/,
-                  message: '拆单数超过生产数量',
+                  message: '拆批数超过生产数量',
                   trigger: ['blur', 'change']
                 }
               ]"
@@ -111,7 +111,7 @@
           </template>
         </ele-pro-table>
 
-        <headerTitle title="拆单" class="mt20"> </headerTitle>
+        <headerTitle title="拆批" class="mt20"> </headerTitle>
 
         <ele-pro-table
           ref="table"
@@ -206,7 +206,7 @@
         columns: [
           {
             prop: 'batchNo',
-            label: '原批次号',
+            label: '批次号',
             align: 'center',
             minWidth: 100,
             showOverflowTooltip: true
@@ -238,7 +238,7 @@
         columns2: [
           {
             prop: 'batchNo',
-            label: '批次号',
+            label: '子批次号',
             align: 'center',
             minWidth: 100,
             showOverflowTooltip: true
@@ -321,7 +321,7 @@
               this.$nextTick(() => {
                 this.$set(this.form.unpackList[index], 'requiredFormingNum', 0);
               });
-              this.$message.error('拆单数超过生产数量');
+              this.$message.error('拆批数超过生产数量');
 
               return;
             }
@@ -352,7 +352,7 @@
               this.form.unpackList[0].requiredFormingNum ==
                 this.formData.requiredFormingNum
             ) {
-              this.$message.info('拆单数要大于1');
+              this.$message.info('拆批数要大于1');
               return false;
             }
 
@@ -360,7 +360,7 @@
               this.form.surplusUnpack.length == 1 &&
               this.form.unpackList.length == 0
             ) {
-              this.$message.info('拆单数要大于1');
+              this.$message.info('拆批数要大于1');
               return false;
             }
 

src/views/productionPlan/index.vue

@@ -111,7 +111,6 @@
           <el-link
             type="primary"
             :underline="false"
-            icon="el-icon-truck"
             v-if="row.status == 2"
             @click="handleOrderPublish(1, row)"
           >
@@ -121,7 +120,6 @@
             type="primary"
             v-if="row.status == 3"
             :underline="false"
-            icon="el-icon-truck"
             @click="handleOrderPublish(2, row)"
           >
             重新发布
@@ -130,7 +128,6 @@
             v-if="row.splitBatch != 2 && !row.joinPlanCode && activeName == 'first'"
             type="primary"
             :underline="false"
-            icon="el-icon-edit"
             @click="planEdit(row)"
           >
             修改
@@ -149,15 +146,7 @@
             拆批
           </el-link>
 
-          <el-link
-            type="danger"
-            v-if="activeName == 'first'"
-            :underline="false"
-            @click="handleDelete(row)"
-            icon="el-icon-delete"
-          >
-            删除
-          </el-link>
+
         </template>
       </ele-pro-table>
     </el-card>
@@ -309,7 +298,7 @@
           {
             slot: 'batchNo',
             prop: 'batchNo',
-            label: '批次号',
+            label: '子批次号',
             align: 'center',
             minWidth: 120,
             showOverflowTooltip: true
@@ -317,7 +306,7 @@
 
           {
             prop: 'joinBatchNo',
-            label: '原批次号',
+            label: '批次号',
             align: 'center',
             minWidth: 120,
             showOverflowTooltip: true
@@ -334,6 +323,16 @@
             sortable: true
           },
 
+          {
+            prop: '',
+            action: '',
+            label: '销售订单号',
+            align: 'center',
+            showOverflowTooltip: true,
+            minWidth: 160,
+
+          },
+
           {
             prop: 'scheduleStatusName',
             label: '进度状态',
@@ -653,18 +652,6 @@
         this.$refs.DetailsRef.open(type, row);
       },
 
-      handleDelete({ id }) {
-        this.$confirm('确定删除当前数据?', '提示')
-          .then(async () => {
-            await del(id);
-            this.$message.success('删除成功！');
-            this.reload();
-          })
-          .catch((err) => {
-            console.error(err);
-          });
-      },
-
       onSortChange(e) {
         let sort = {
           orderBy: e.order,

src/views/saleOrder/components/order-search.vue

@@ -4,55 +4,55 @@
     <el-row :gutter="15">
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="关键字:">
-          <el-input v-model="where.keyWord" placeholder="请输入"></el-input>
+          <el-input v-model="where.keyWord" size="mini" placeholder="请输入"></el-input>
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="销售订单号:">
-          <el-input v-model="where.code" placeholder="请输入"></el-input>
+          <el-input v-model="where.code" size="mini"  placeholder="请输入"></el-input>
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="物料编码:">
-          <el-input v-model="where.productCode" placeholder="请输入"></el-input>
+        <el-form-item label="产品编码:">
+          <el-input v-model="where.productCode" size="mini"  placeholder="请输入"></el-input>
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="行号:">
-          <el-input v-model="where.lineNumber" placeholder="请输入"></el-input>
+          <el-input v-model="where.lineNumber" size="mini"  placeholder="请输入"></el-input>
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="牌号:">
-          <el-input v-model="where.brandNo" placeholder="请输入"></el-input>
+          <el-input v-model="where.brandNo" size="mini"  placeholder="请输入"></el-input>
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="型号:">
-          <el-input v-model="where.model" placeholder="请输入"></el-input>
+          <el-input v-model="where.model" size="mini"  placeholder="请输入"></el-input>
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="订单来源:">
-          <DictSelection dictName="订单来源" clearable v-model="where.orderSource">
+          <DictSelection dictName="订单来源" size="mini"  clearable v-model="where.orderSource">
           </DictSelection>
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="客户名称:">
-          <el-input v-model="where.customerName" placeholder="请输入"></el-input>
+          <el-input v-model="where.customerName" size="mini"  placeholder="请输入"></el-input>
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="订单类型:">
-          <DictSelection dictName="订单类型" clearable v-model="where.orderType">
+          <DictSelection dictName="订单类型" clearable size="mini"  v-model="where.orderType">
           </DictSelection>
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="生产状态:">
-          <el-select v-model="where.proStu" placeholder="请选择" class="w100">
-            <el-option v-if="activeName == 'first'" v-for="item in awaitProcuct" :key="item.value" :label="item.label"
+          <el-select v-model="where.proStu" placeholder="请选择" class="w100" size="mini" >
+            <el-option v-if="activeName == 'first'"  v-for="item in awaitProcuct" :key="item.value" :label="item.label"
               :value="item.value">
             </el-option>
             <el-option v-if="activeName == 'second'" v-for="item in alreadyProcuct" :key="item.value" :label="item.label"
@@ -63,7 +63,7 @@
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="按单按库:">
-          <el-select v-model="where.orderLibraryType" placeholder="请选择" class="w100">
+          <el-select v-model="where.orderLibraryType" placeholder="请选择" class="w100" size="mini" >
             <el-option v-for="item in orderTypeList" :key="item.value" :label="item.label" :value="item.value">
             </el-option>
           </el-select>
@@ -71,27 +71,27 @@
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="业务员:">
-          <el-input v-model="where.salesman" placeholder="请输入"></el-input>
+          <el-input v-model="where.salesman" size="mini"  placeholder="请输入"></el-input>
         </el-form-item>
       </el-col>
 
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="产品名称:">
-          <el-input v-model="where.productName" placeholder="请输入"></el-input>
+        <el-form-item label="产品名称:" >
+          <el-input v-model="where.productName" size="mini"  placeholder="请输入"></el-input>
         </el-form-item>
       </el-col>
 
 
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="交货日期:">
-          <el-date-picker style="width: 100%" v-model="time" type="daterange" range-separator="至" start-placeholder="开始日期"
-            end-placeholder="结束日期" value-format="yyyy-MM-dd HH:mm:ss" :default-time="['00:00:00', '23:59:59']">
+          <el-date-picker style="width: 100%" v-model="time" type="daterange" range-separator="至" start-placeholder="开始日期" 
+            end-placeholder="结束日期" size="mini"  value-format="yyyy-MM-dd HH:mm:ss" :default-time="['00:00:00', '23:59:59']">
           </el-date-picker>
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 6 } : { span: 6 }">
         <el-form-item label="组织机构:">
-          <auth-selection data-type="Array" v-model="where.deptIds" style="width: 100%"></auth-selection>
+          <auth-selection data-type="Array" size="mini"  v-model="where.deptIds" style="width: 100%"></auth-selection>
         </el-form-item>
       </el-col>
 
@@ -103,7 +103,7 @@
           <el-button @click="reset" icon="el-icon-refresh-left" type="primary">重置</el-button>
         </div>
       </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 24, md: 24 } : { span: 24 }">
+      <el-col v-bind="styleResponsive ? { lg: 24, md: 24 } : { span: 24 }" v-if="activeName == 'first'">
         <el-form-item label-width="0px">
           <div class="btn-wrapper">
             <el-button @click="goProduct">转生产计划</el-button>

src/views/saleOrder/index.vue

@@ -138,7 +138,10 @@
             width: 45,
             type: 'selection',
             columnKey: 'selection',
-            align: 'center'
+            align: 'center',
+            selectable: (row, index) => {
+              return this.activeName != 'second';
+            }
           },
           {
             columnKey: 'index',

src/views/saleOrder/salesToProduction.vue

@@ -2,7 +2,7 @@
   <div class="ele-body">
     <el-card shadow="never">
       <div class="body-title">
-        <div class="title-left">销售订单转生产计划</div>
+        <div class="title-left">{{type == 'edit' ? '计划修改' : '销售订单转生产计划'}}</div>
         <div class="title-right">
           <el-button @click="cancel">取消</el-button>
           <el-button type="primary" @click="toSubmit" :loading="loading">
@@ -374,13 +374,7 @@
                   value-format="yyyy-MM-dd"
                 >
                 </el-date-picker>
-                <!-- 	<el-date-picker
-						   style="width: 100%;"
-						   v-model="scope.row.reqMoldTime"
-						   type="datetime"
-						   placeholder="选择日期"
-						   value-format="yyyy-MM-dd HH:mm:ss">
-						 </el-date-picker> -->
+   
               </el-form-item>
             </template>
           </el-table-column>
@@ -433,13 +427,13 @@
 
           <el-table-column label="操作" align="center" width="70" fixed="right">
             <template slot-scope="scope">
-              <el-button type="text" @click="handleDeleteItem(scope.$index)"
+              <el-button type="text" @click="handleDeleteItem(scope.$index)" v-if="type != 'edit'"
                 >删除</el-button
               >
             </template>
           </el-table-column>
         </el-table>
-        <div class="add-product" @click="addEquipment">
+        <div class="add-product" @click="addEquipment" v-if="type != 'edit'">
           <i class="el-icon-circle-plus-outline"></i>
         </div>
         <el-row :gutter="24">