Merge remote-tracking branch 'origin/master'

wms_pro/qd/src/views/wms/base_manage/customer/index.vue

@@ -2,6 +2,14 @@
   <div class="app-container">
     <!--工具栏-->
     <div class="head-container">
+      <el-form
+        :inline="true"
+        class="demo-form-inline"
+        label-position="right"
+        label-width="80px"
+        label-suffix=":"
+      >
+        <el-form-item label="客户信息">
           <el-input
             v-model="query.search"
             clearable
@@ -11,7 +19,9 @@
             prefix-icon="el-icon-search"
             class="filter-item"
           />
+        </el-form-item>
         <rrOperation/>
+      </el-form>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission">
         <el-button

wms_pro/qd/src/views/wms/base_manage/measure/index.vue

@@ -2,6 +2,14 @@
   <div class="app-container">
     <!--工具栏-->
     <div class="head-container">
+      <el-form
+        :inline="true"
+        class="demo-form-inline"
+        label-position="right"
+        label-width="80px"
+        label-suffix=":"
+      >
+        <el-form-item label="单位信息">
           <el-input
             v-model="query.search"
             clearable
@@ -11,7 +19,9 @@
             prefix-icon="el-icon-search"
             class="filter-item"
           />
+        </el-form-item>
         <rrOperation/>
+      </el-form>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission" />
       <!--表单组件-->

wms_pro/qd/src/views/wms/base_manage/supplier/index.vue

@@ -2,6 +2,14 @@
   <div class="app-container">
     <!--工具栏-->
     <div class="head-container">
+      <el-form
+        :inline="true"
+        class="demo-form-inline"
+        label-position="right"
+        label-width="100px"
+        label-suffix=":"
+      >
+        <el-form-item label="供应商信息">
           <el-input
             v-model="query.search"
             clearable
@@ -11,7 +19,9 @@
             prefix-icon="el-icon-search"
             class="filter-item"
           />
+        </el-form-item>
         <rrOperation/>
+      </el-form>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission" />
       <!--表单组件-->

wms_pro/qd/src/views/wms/early_manage/early_inv/index.vue

@@ -11,7 +11,7 @@
           label-width="90px"
           label-suffix=":"
         >
-          <el-form-item label="安全库存放啊">
+          <el-form-item label="安全库存">
             <el-select
               v-model="query.form_type"
               placeholder="请选择类型"

wms_pro/qd/src/views/wms/flow_manage/act/execution/index.vue

@@ -2,6 +2,14 @@
   <div class="app-container">
     <!--工具栏-->
     <div class="head-container">
+      <el-form
+        :inline="true"
+        class="demo-form-inline"
+        label-position="right"
+        label-width="80px"
+        label-suffix=":"
+      >
+        <el-form-item label="模型名称">
           <el-input
             v-model="query.search"
             clearable
@@ -11,6 +19,8 @@
             prefix-icon="el-icon-search"
             class="filter-item"
           />
+        </el-form-item>
+        <el-form-item label="实例ID">
           <el-input
             v-model="query.proc_inst_id"
             clearable
@@ -20,7 +30,9 @@
             prefix-icon="el-icon-search"
             class="filter-item"
           />
+        </el-form-item>
         <rrOperation/>
+      </el-form>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission"/>
       <!--表单组件-->
@@ -104,7 +116,8 @@
         <el-table-column prop="remark" show-overflow-tooltip show-tooltip-when-overflow label="备注"/>
         <el-table-column prop="form_type" show-overflow-tooltip show-tooltip-when-overflow width="130" label="表单类型"/>
         <el-table-column prop="form_id" show-overflow-tooltip show-tooltip-when-overflow width="130" label="表单id"/>
-        <el-table-column prop="form_data" show-overflow-tooltip show-tooltip-when-overflow width="130" label="表单数据" :formatter="jsonFormat"/>
+        <el-table-column prop="form_data" show-overflow-tooltip show-tooltip-when-overflow width="130" label="表单数据"
+                         :formatter="jsonFormat"/>
         <el-table-column prop="create_id" label="创建人" width="135"/>
         <el-table-column prop="create_time" label="创建时间" width="135"/>
         <el-table-column prop="update_time" label="修改时间" width="135"/>
@@ -121,8 +134,26 @@
               :permission="permission"
               style="display: inline"
             />
-            <el-button slot="right" @click="flowConfirm(scope.row.proc_inst_id)" type="text" icon="el-icon-video-play" size="mini">触发</el-button>
-            <el-button slot="right" @click="viewClick(scope.row)" type="text" icon="el-icon-thumb" size="mini">预览</el-button>
+            <el-popover
+              placement="top"
+              width="180"
+              trigger="click"
+              :value="popoverVisible"
+              @hide="onPopoverHide"
+            >
+              <p>{{ popoverMessage }}</p>
+              <div style="text-align: right; margin: 0">
+                <el-button size="mini" type="text" @click="cancelFlow">取消</el-button>
+                <el-button :loading="triggerLoading" type="primary" size="mini"
+                           @click="confirmFlow(scope.row.proc_inst_id)">确定
+                </el-button>
+              </div>
+              <el-button slot="reference" type="text" icon="el-icon-video-play" size="mini" @click="showPopover">触发
+              </el-button>
+            </el-popover>
+            <!--            <el-button slot="right" @click="flowConfirm(scope.row.proc_inst_id)" type="text" icon="el-icon-video-play" size="mini">触发</el-button>-->
+            <el-button slot="right" @click="viewClick(scope.row)" type="text" icon="el-icon-thumb" size="mini">预览
+            </el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -181,6 +212,9 @@ export default {
       formTypes: [],
       permission: {},
       modelJson: '',
+      popoverMessage: "确定要触发流程吗？",
+      triggerLoading: false,
+      popoverVisible: false,
       statusList: [
         {
           value: "30",
@@ -209,6 +243,23 @@ export default {
       this.form.form_data = JSON.stringify(this.form.form_data)
       return true
     },
+    showPopover() {
+      this.popoverVisible = true;
+    },
+    cancelFlow() {
+      this.popoverVisible = false;
+    },
+    confirmFlow(proc_inst_id) {
+      this.triggerLoading = true;
+      curdExecution.flowConfirm(proc_inst_id).then(res => {
+        this.crud.notify("触发成功", CRUD.NOTIFICATION_TYPE.SUCCESS)
+        this.triggerLoading = false;
+        this.popoverVisible = false;
+      })
+    },
+    onPopoverHide() {
+      this.triggerLoading = false;
+    },
     jsonFormat(row, index) {
       if (row.form_data != null) {
         return JSON.stringify(row.form_data)

wms_pro/qd/src/views/wms/flow_manage/act/model/index.vue

@@ -2,16 +2,26 @@
   <div class="app-container">
     <!--工具栏-->
     <div class="head-container">
+      <el-form
+        :inline="true"
+        class="demo-form-inline"
+        label-position="right"
+        label-width="80px"
+        label-suffix=":"
+      >
+        <el-form-item label="模型信息">
           <el-input
             v-model="query.search"
             clearable
             style="width: 300px"
             size="mini"
-        placeholder="输入模型名称"
+            placeholder="请输入模型名称"
             prefix-icon="el-icon-search"
             class="filter-item"
           />
+        </el-form-item>
         <rrOperation/>
+      </el-form>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission"/>
       <!--表单组件-->
@@ -111,12 +121,12 @@
           <template slot-scope="scope">
             <el-button size="mini" type="text" icon="el-icon-edit" @click="crud.toEdit(scope.row)">修改</el-button>
             <el-button size="mini" type="text" icon="el-icon-delete" @click="handdeleted(scope.row)">删除</el-button>
-            <el-dropdown size="mini">
+            <el-dropdown trigger="click" size="mini">
               <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
               <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item icon="el-icon-refresh-right"><span @click="publishClick(scope.row)">发布</span></el-dropdown-item>
-                <el-dropdown-item icon="el-icon-key"><span @click="viewClick(scope.row)">预览</span> </el-dropdown-item>
-                <el-dropdown-item icon="el-icon-key"><span @click="handleClick(scope.row)">设计</span></el-dropdown-item>
+                <el-dropdown-item :disabled="publishDisabled(scope.row)" @click.native="publishClick(scope.row)" icon="el-icon-refresh-right"><span>发布</span></el-dropdown-item>
+                <el-dropdown-item icon="el-icon-thumb" @click.native="viewClick(scope.row)"><span>预览</span> </el-dropdown-item>
+                <el-dropdown-item icon="el-icon-set-up" @click.native="handleClick(scope.row)"><span>设计</span></el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
           </template>

wms_pro/qd/src/views/wms/pm_manage/form_data/ViewDialog.vue

@@ -34,7 +34,22 @@
         <el-input v-model="form.vehicle_code" disabled clearable style="width: 210px"/>
       </el-form-item>
       <el-form-item label="单据状态" prop="status">
-        <el-input v-model="form.status" disabled clearable style="width: 210px"/>
+        <el-select
+          v-model="form.status"
+          clearable
+          size="mini"
+          placeholder="请选择"
+          class="filter-item"
+          style="width: 180px;"
+          disabled
+        >
+          <el-option
+            v-for="item in formStatus"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+<!--        <el-input v-model="form.status" disabled clearable style="width: 210px"/>-->
       </el-form-item>
       <el-form-item label="创建时间" prop="create_time">
         <!--        <el-date-picker v-model="form.create_time" type="date" placeholder="选择日期" style="width: 210px"-->
@@ -72,7 +87,13 @@
         <el-table-column prop="pcsn" label="批次" show-overflow-tooltip width="120"/>
         <el-table-column prop="qty" label="物料数量" show-overflow-tooltip/>
         <el-table-column prop="vehicle_code" label="载具编号" show-overflow-tooltip width="120"/>
-        <el-table-column prop="status" label="单据状态" show-overflow-tooltip width="120"/>
+        <el-table-column prop="status" label="单据状态" show-overflow-tooltip width="120">
+          <template slot-scope="scope">
+            <template v-for="item in formStatus">
+              <span v-if="item.value === scope.row.status">{{ item.label }}</span>
+            </template>
+          </template>
+        </el-table-column>
         <el-table-column prop="proc_inst_id" label="对应流程实例id" show-overflow-tooltip width="120"/>
         <el-table-column prop="parent_id" label="父单据数据id" show-overflow-tooltip width="120"/>
         <el-table-column width="130" show-overflow-tooltip v-for="(item, index) in cols" :key="item.value"
@@ -115,7 +136,21 @@ export default {
       storlist: [],
       currentdtl: null,
       currentDis: {},
-      form: {}
+      form: {},
+      formStatus: [
+        {
+          value: '10',
+          label: '生成'
+        },
+        {
+          value: '20',
+          label: '执行中'
+        },
+        {
+          value: '99',
+          label: '完成'
+        }
+      ]
     }
   },
   watch: {

wms_pro/qd/src/views/wms/pm_manage/form_data/index.vue

@@ -85,7 +85,10 @@
         <el-table-column type="selection" width="55"/>
         <el-table-column prop="code" label="单据编码" show-overflow-tooltip width="120">
           <template slot-scope="scope">
-            <el-link v-if="scope.row.hasChildren" type="warning" @click="toView(scope.row)">{{ scope.row.code }}</el-link>
+            <el-link v-if="scope.row.hasChildren" type="warning" @click="toView(scope.row)">{{
+                scope.row.code
+              }}
+            </el-link>
             <span v-else>{{ scope.row.code }}</span>
           </template>
         </el-table-column>
@@ -96,7 +99,13 @@
         <el-table-column prop="pcsn" label="批次" show-overflow-tooltip width="120"/>
         <el-table-column prop="qty" label="物料数量" show-overflow-tooltip/>
         <el-table-column prop="vehicle_code" label="载具编号" show-overflow-tooltip width="120"/>
-        <el-table-column prop="status" label="单据状态" show-overflow-tooltip width="120"/>
+        <el-table-column prop="status" label="单据状态" show-overflow-tooltip width="120">
+          <template slot-scope="scope">
+            <template v-for="item in formStatus">
+              <span v-if="item.value === scope.row.status">{{ item.label }}</span>
+            </template>
+          </template>
+        </el-table-column>
         <el-table-column prop="proc_inst_id" label="对应流程实例id" show-overflow-tooltip width="120"/>
         <el-table-column prop="parent_id" label="父单据数据id" show-overflow-tooltip width="120"/>
         <el-table-column width="130" show-overflow-tooltip v-for="(item, index) in cols" :key="item.value"
@@ -189,7 +198,21 @@ export default {
       fromTypes: [],
       permission: {},
       rules: {},
-      hideShowDialog: false
+      hideShowDialog: false,
+      formStatus: [
+        {
+          value: '10',
+          label: '生成'
+        },
+        {
+          value: '20',
+          label: '执行中'
+        },
+        {
+          value: '99',
+          label: '完成'
+        }
+      ]
     }
   },
   created() {